minor fix
Merge branch 'development' of github.com:crazedsanity/dotCom into development

* 'development' of github.com:crazedsanity/dotCom: (28 commits)
  Exclusive blog for GoFundMe donations, nicer messagebox.
  Content-type for testing
  Fix lost password to match cs-webapplibs
  Drop support for old password mechanism
  Fix registration, minor tweaks, cleaning
  Social media & session stuff
  Changes for logs (sorting)
  Fix logging
  Admin logs, misc template fixes
  Fix link for lost password
  Finished lost password
  Cleanup of JSON test for Joe
  version bump
  password_* functions for PHP5.3+
  Added analytics
  Lost Password (#1), TTORP testing
  Lib cleanup
  JSON thing for Joe's testing on TTORP
  Members can change email and passwords
  Fix some broken require_once stuff
  ...

Conflicts:
	includes/shared.inc