Partially test Login controller
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project
Merge pull request #1 from linkTDP/origin/master

Origin/master