Merge origin/master

Conflicts:
	public/js/custom.js
	public/js/script.js