Added Q&A as well, updated some namespace issues. Need to check to see if Date made in.
Merge remote-tracking branch 'origin/master'