Configure User Authentication
Merge branch 'master' of https://github.com/mark-c-valderrama/JP002

Conflicts:
	protected/models/User.php