Merge branch 'master' of github.com:BluesInMyBrain/ladoshki

Conflicts:
	application/controllers/home.php
Merge branch 'master' of github.com:BluesInMyBrain/ladoshki