cache
Merge branch 'master' of https://github.com/TMfranken/cfapp

Conflicts:
	spec/controllers/answers_controller_spec.rb
	spec/factories.rb
Json has many alterations
Merge branch 'master' of https://github.com/TMfranken/cfapp