bug fix front
Merge branch 'master' of https://github.com/kilabs/archer

Conflicts:
	protected/controllers/front/UserController.php
	protected/models/front/FrontLoginForm.php