finishing merges
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/application.js