Merge pull request #18 from Zappeion/pv

Questions flow almost done, basic templates for current states done, fix...
Merge pull request #23 from Zappeion/master

merging master to jg_2 branch
Added GET routes for program
Added GET course routes
Updated userModel,
Refactored all questions by user route to userRoutes,
Added get all market Posts, Conversations, and Favourites to userRoutes,
prototyped market and conversation routes/models,
Created basic routes for conversations
updated new question routes and user model
Merge remote-tracking branch 'remotes/origin/jg_2' into pv

Conflicts:
	package.json
	public/js/sos.js
	server/courses/courseModel.js
	server/server.js
	server/users/userModel.js
	server/users/userRoutes.js