updated the login form, and re-added the register modal
Merge branch 'master' of github.com:Cysha/pxcms-default