register/login form stuff
Merge remote-tracking branch 'salij/master'