edited server images to be on aws
working Q&A feature
deleted answer model
Merge remote-tracking branch 'upstream/master'