modified:   spree_faq.gemspec
Merge branch 'master' of https://github.com/usemodj/spree-faq
	modified:   app/controllers/admin/question_categories_controller.rb