mainView frame
Merge branch 'master' of https://github.com/IvanDimanov/sedmataposoka

Conflicts:
	application/views/categoryView.php
	application/views/contactView.php
	application/views/eventView.php
	application/views/homeView.php
	application/views/subcategoryView.php
	application/views/templates/header.php
Merge pull request #25 from fitil4e/master

url update