Merge branch 'master' into aggregate_public_list
aggregate all bookmarks in system
Merge branch 'master' into aggregate_public_list
matching works
aggregation works on api
sorting and proper data structure
Public blocks work correctly
Merge branch 'aggregate_public_list'

Conflicts:
	app/models/bookmark.js