Merge branch 'master' into upload

Conflicts:
	client/accounts.coffee
	lib/person.coffee
	server/person.coffee
	smart.json
	smart.lock
Merge branch 'upload' of https://github.com/peerlibrary/peerlibrary into upload

Conflicts:
	lib/person.coffee
	smart.lock