rubocop madness fixed
fixed merge conflict
fixed another rubocop
refactored question template - because its an active record model we don't want to pollute it with freebase stuff so i created a new class question_generator which should handle all the generations
removed ssl encryption
Merge branch 'master' of github.com:secretBears/QAPI

merged master