Merge branch 'dev' of github.com:secretBears/qapi into dev_alex

Conflicts:
	app/controllers/admin/question_templates_controller.rb
	app/models/question_template.rb
	app/views/admin/question_templates/_form.html.erb
	app/views/admin/question_templates/index.html.erb
	app/views/question_templates/_form.html.erb
	app/views/question_templates/index.html.erb
	db/schema.rb
	db/seeds.rb
	test/controllers/admin/question_templates_controller_test.rb
removed old mergeconflict hint from last merge conflict
Merge branch 'dev_alex'

Conflicts:
	app/models/question_template.rb
added json and switched to simple form for question templates
allowing negative lat/lng values in /api/:latitude/:longitude route
added parse to hash before save and output of query in no result error in query model
converting non-float values to float coordinate values in place model
added yield block to execute javascript after all components have been loaded
removed presence validation of query column in question_template model
re-added show_lat_long action to questions controller
changed some styling
updated seeds so that query hashes are no JSON Strings instead of ruby hashes
removed if-condition for parsing the query_hash in query model
directly rendering resulting question object as json for the moment
Merge remote-tracking branch 'origin/master'
adding .DS_STORE to .gitignore
some more view refinements...too stupid to fix delete confirm not working atm