updating poms for 0.1.11-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
Landing page text changes
email verification text change - as per lesley's document
Rory's changes to email verification
added colon
usage declaration text change - as per lesley's document
Text change - password reset title
drop down menu text
MLDS-311 Widen permissions - allow staff to change affiliate type, etc.
Cleanup dead
MLDS-567 Extend search to 2nd and 3rd email, and update index on change
Test fix
MLDS-390 - Text changes for release page
Content change
MLDS-540 MLDS-170 Extend user_id replacement of user_login to password_reset_token.
MLDS-676 Change default "From" address from @mailinator to @intelliware on dev/demo to avoid deliverability problems
MLDS-668 Highlight changes in the event log