Merge branch 'master' into dev

Conflicts:
	views/template.html