commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	cloud/service/site/ShelfService.js