no message
Merge branch 'master' of https://github.com/slonofanya/slframe

Conflicts:
	application/common/controller/basic.class.php