Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

1
ALTER TABLE  `sys_session` CHANGE  `session_id`  `session_id` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;