Uppercase issues #2.
Merge branch 'master' of https://github.com/Kajna/K

Conflicts:
	app/controllers/admin.php
	app/controllers/home.php