#
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/connection.js
#