Merge remote-tracking branch 'origin/mr/41' into feat-variable-consistency

Conflicts:
	app/__init__.py
	app/templates/account/certify.html