Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

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