rozwiazanie konfliktow

Conflicts:
	application/controllers/Controller.php
	application/controllers/MainController.php