user qr code generating
Merge branch 'master' of https://github.com/givechange/web

Conflicts:
	.meteor/packages
	.meteor/versions
fix issue with router