Merge branch 'ken-merge'
Linked up question, can view questions.
 Changes to be committed:
	modified:   public/index.html
	modified:   public/js/directives/nav/nav.html
	modified:   public/js/directives/nav/nav.js
	modified:   public/js/sos.js
	modified:   public/partials/header.html
	modified:   public/templates/questions.html
Merge pull request #16 from Zappeion/jg_2

Jg 2
Merge pull request #17 from Zappeion/pv

Linked up question, can view questions.
Questions flow almost done, basic templates for current states done, fixed small bug with question api, changed to older db by default.
 Changes to be committed:
	modified:   public/css/dashboard.css
	modified:   public/js/directives/nav/nav.html
	modified:   public/js/sos.js
	modified:   public/partials/header.html
	new file:   public/templates/dashboard.html
	new file:   public/templates/favorites.html
	new file:   public/templates/market.html
	new file:   public/templates/messages.html
	new file:   public/templates/myposts.html
	new file:   public/templates/newQuestion.html
	new file:   public/templates/questionDetails.html
	modified:   public/templates/questions.html
	new file:   public/templates/settings.html
	modified:   server/etc/database.json
	modified:   server/questions/questionRoutes.js
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