login view added
Merge branch 'develop'

Conflicts:
	View/Users/login.ctp