user_page
Merge branch 'master' of https://github.com/givechange/web

Conflicts:
	lib/router.js
Restaurant new page, not working
Merge branch 'master' of github.com:givechange/web
user_page is working
Merge branch 'master' of github.com:givechange/web

sage aborts
Reformatted routes to follow same format
user - file upload is working
Merge branch 'master' of https://github.com/givechange/web
init qr code uploader
mergefix