group1-4 Auth model
Merge remote-tracking branch 'origin/master' into group1-4

Conflicts:
	protected/config/main.php
Merge branch 'master' of https://github.com/HelloWorld-PHPJunior/group1 into group1-4
group1-4 Auth model
init User controller