spring security custom login form
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	legoManager-web/src/main/webapp/login.jsp
completed user/admin roles at presentation/service layer