Merge branch 'master' into dev

Conflicts:
	app/scripts/directives/scene-element.js