Merge branch 'master' of https://github.com/PrashanthKumarM/spock

Conflicts:
	app/controllers/surveys_controller.rb
	db/schema.rb

Signed-off-by: hariji <hariharan@freshdesk.com>