Members can change email and passwords
Merge branch 'master' into development

* master:
  Update to TTORP
  Fix CSS URL typo
  Login fix, minor cleanup + bug fixes
  Merge all dev back into master

Conflicts:
	VERSION