More features to Add Feedback
Merge branch 'master' of https://github.com/pravchuk/FeedBack

Conflicts:
	www/js/controllers.js