made surveys JSON to include all questions and options
Merge branch 'master' of https://github.com/a-plus-plus/aktivator

Conflicts:
app/views/surveys/index.json.jbuilder
Merge branch 'master' of https://github.com/a-plus-plus/aktivator

Conflicts:
	app/views/surveys/index.json.jbuilder