Some fixes
Merge branch 'master' of https://github.com/vladimir-tymishak/web_diploma

Conflicts:
	www/application/controllers/main.php
	www/application/views/clientPersonalSpace.php