Adds voting functionality for questions.
Merge branch 'master' of github.com:climatewarrior/p2p-app

Conflicts:
	app/js/services.js