Fixing author contact things.
Merge branch 'master' into module

Conflicts:
	controllers/author_contact_controller.py