Lots of changes to accomodate Clarify updates
Merge branch 'master' of https://github.com/t3kk/BuzzwordBingo

Conflicts:
	app/routes.py