Added test ids to unit tests to ease integration with test documents.
Merge branch 'production' into backend-dev
Add narratives save action
Fix publish checkbox
Merge branch 'narratives-save' into backend-dev
Modify save button
Reindent narratives index html
Add forget password functionality for admin.
Change the mailer default sender email and fix the forget_password submit call
Add change password functionality for admin.
Add adding new administrator functionality for admin.
Refactor and comment narratives#save
Merge remote-tracking branch 'origin/backend-dev' into backend-dev
Add test for save narrative changes
Style setting page for admin
Merge pull request #46 from felixsoum/frontend-dev

Frontend dev weekly
Merge pull request #47 from felixsoum/backend-dev

Backend dev weekly
Merge branch 'frontend' into backend

Conflicts:
	db/development.sqlite3