qr generate - bugfix - defer loading until data is ready, for real this time?
Merge branch 'master' of https://github.com/givechange/web

Conflicts:
	client/templates/users/user_item.html