Merge remote-tracking branch 'origin/master'

Conflicts:
	app.py
	database.pyc