Added placeholders to login form
Merge branch 'userlogin' into development