Merge branch 'master' of https://github.com/RORLabNew/rorla_api

Conflicts:
	spec/controllers/answers_controller_spec.rb
Merge branch 'master' of https://github.com/plaredspear/rorla_api

Conflicts:
	spec/controllers/answers_controller_spec.rb