Merge branch 'master' of /Applications/MAMP/htdocs/autoschool-new.ru with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/application/classes/Model/User.php
model user