Merge remote-tracking branch 'origin/master'

Conflicts:
	Web app/app/views.py