Merge branch 'master' into userdb

Conflicts:
	couchdb/general/_design/categories/views/by_weight/map.js
WIP