add user support
Merge branch 'master' of https://github.com/oliviert/askpebble

Conflicts:
	server/models/question.js