Merge jg to master branch

I'm merging my branch with the question and answer api routes into master.
We can then merge Prasanth's branch with the repo layout change.

Prasanth, can you review the changes when you have a chance and create your pull request when you have some time?