Refactor question json responses to allow for russian doll caching
refactor question json to use draper
Merge branch 'master' into feature/russian-doll-caching

Conflicts:
	Gemfile.lock
	app/views/questions/_question_list.html.haml
Merge branch 'master' into feature/russian-doll-caching

Conflicts:
	Gemfile.lock
	app/views/questions/_question_list.html.haml
add dalli gem and memcachedcloud config
Merge branch 'feature/russian-doll-caching' of github.com:askaway/askaway into feature/russian-doll-caching

Conflicts:
	app/views/questions/_question_list.html.haml
compact queries with includes
fix how answers get decorated
optimize query for question show page
Merge pull request #151 from askaway/feature/russian-doll-caching

Initial fragment caching of answers in json responses
Script tag, type application/json; html_safe.
Merge pull request #154 from askaway/more-better-encoding-of-javascript-questions

More better encoding of javascript questions
Merge branch 'master' into feature/query-optimization

Conflicts:
	app/controllers/questions_controller.rb
Merge pull request #153 from askaway/feature/query-optimization

Compact queries with includes
Merge branch 'master' into add-constants-to-control-index-weighting

Conflicts:
	db/structure.sql