Addend view category controller and view
Merge branch 'master' of https://github.com/aleksandersowiak/MagicznyDom

Conflicts:
	.idea/workspace.xml
	application/Bootstrap.php