remove resultsWS
Merge branch 'master' of https://github.com/atamborrino/ZenFeedback
Merge branch 'master' of https://github.com/atamborrino/ZenFeedback

Conflicts:
	app/assets/stylesheets/main.less