no message
Merge branch 'master' of https://github.com/loncool/YaSkeleton

Conflicts:
	application/Bootstrap.php
	application/controllers/Index.php