Merge branch 'develop' of https://github.com/kaize/itc73 into feature/airbrake_and_fixing_routes_103_104

Conflicts:
	Gemfile
Changing name of feedbacks and counters
Merge branch 'feature/airbrake_and_fixing_routes_103_104' into staging

Conflicts:
	Gemfile