Added types to questions
Merge branch 'master' into surveys-on-steroids

Conflicts:
	Gemfile.lock
Merge branch 'master' into surveys-on-steroids
Merge branch 'master' into surveys-on-steroids
Surveys moved to his own place #37
Upgrade NewRelic RPM to track sidekiq workers
Correct image cancan ability
Avoid turbolinks in content documents
Merge branch 'master' into surveys-on-steroids

Conflicts:
	Gemfile.lock
	app/models/ability.rb
Survey model cleanup...
Contents view cleanup...
Surveys views cleanup...
Cleanup surveys render csv...
Add question type selection in surveys...
Question types views added...
Dynamic selection of question types in surveys
Replies are now question type aware =)
Survey cancan ability _improved_...
Improved surveys show
Fixed survey ability (again)