Retracing steps that caused the breakdown
Functionality restored
Merge branch 'old-state'

Conflicts:
	client/views/router.coffee
	client/views/viewtype/manage/manageSurvey/manage-survey-create.jade
	client/views/viewtype/manage/manageSurvey/manage-survey-edit.jade
	client/views/viewtype/manage/manageSurvey/manageSurveyLanguage.coffee
	client/views/viewtype/manage/manageSurveyHelpers.coffee
	collections/collections.coffee
	pollonium.help
	server/server.coffee
Mergefix