Merge origin/master

Conflicts:
	web/js/my.js