finished issue
finished ticket
move sms password reset
done ticket
changed admin enduser add
added print statements if ambassadors and journalists already exist
changed tests
Merge branch 'feature/issue-10-more-tests-for-authentication-app' into develop
Merge branch 'feature/issue-14-site-domain-name-configurable-base-setup-command' into develop
Merge pull request #16 from praekelt/feature/issue-16-featured-discussions

Where have the Chat Groups been implemented?
Delay the password reset SMS.
Manual merge to resolve conflicts in src/app/authentication/tests.py
Merge pull request #9 from praekelt/feature/issue-9-sms-password-move

SMS password reset doesn't do anything.
Merge branch 'master' into qa
Merge branch 'dev' of git.unomena.net:praekelt/ghr into dev
Merge branch 'qa' into dev
finished tests
Merge branch 'feature/issue-16-featured-discussions-extra-test' into develop
Merge branch 'develop' into dev
Made the migrations run in a certain order in the fab file.