spring security login form, admin page
Merge remote-tracking branch 'origin/master'