bookmark and user-noti updates

updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	parse/cloud/app.js
	parse/cloud/user.js