Merge remote-tracking branch 'origin/master'

Conflicts:
	Web app/app/views.pyc

views

Merge remote-tracking branch 'origin/master'

Conflicts:
	Web
app/app/views.pyc

Pyc

web app