Reverting config file
Merge branch 'messagebox' of git://github.com/simong/Hilary into messagebox
Merge master in issue-429-messagebox-entity-urls
Merge master in issue-429-messagebox-entity-urls
Merge master in issue-338 (profile pic test coverage).
Renamed groupAlias across all test files to something more appropriate.
Made displayName a non-optional property in the group model
Fixed failing test for limiting discussion messages.
Added the correct profile paths for discussion objects.
Simplified lines
Merged master in issue-493-removeContentFromLibrary
Merged master in issue-338 (bump in testcoverage for picture cropping).
Renamed 'testUserId' to 'usernameA' in authentication tests (change pw)
Merge branch 'authn-test'

* authn-test:
  Renamed 'testUserId' to 'usernameA' in authentication tests (change pw)
  enable/disable strategies on global so we don't override defaults
  cache strategy status before enabling and reset after testing
  make redirect test work offline
  move associate with non-user test to it's own block
  remove unneccesary check
  test validation in getUserIdFromLoginId
  test changing password on an user with no local auth strategy
  test associateLoginId with user that doesn't exist
  test admin invalid password change
  test that external auth redirects to appropriate host
  test changePassword as someone who isn't admin or the user for whom the password is being changed
Logging error in docs api when a file could not be read.
498 - Added sendmail support
Saving email address for Facebook & Google logins
#514 - Not generating a collabdoc-edit activity when no real update happens.
#498 followup. JSDoc Cleanup, refactor in oae-emails init.
Merge branch 'issue-498-sendmail-support' of git://github.com/simong/Hilary into issue-498-sendmail-support