Merge branch 'master' into develop

Conflicts:
	src/js/model.js