Merge origin/master

Conflicts:
	public_html/js/composer_old.js