FUN-13:Page: View all categories.
Merge branch 'master' of github.com:Lexy92/Funeral

Conflicts:
	mvc/app/controller/category.php
Merge branch 'master' of github.com:Lexy92/Funeral