Merge

Conflicts:
	js/all.min.js