Merge branch 'master' of github.com:NoodleEducation/dataman

Conflicts:
	flask_app.py
	oauth.py