Merge branch 'master' of https://github.com/Jurets/smart_lp1

Conflicts:
	frontend/controllers/OfficeController.php