Merge branch 'fix_is_reseller' into 'master'

Marius Cramer

2014-07-08 8db41e9b3309300054907d2183692dd5fa0f0d56

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