fix editableproperties to work if directly loading the edit screen.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/menu.js
	app/js/services/services.js