add login form
merge with master