portal survey authoring OK + necessary services
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/iObserveAngular/js/factories.js