use hasOwnProperty
added admin check
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	storage.js
only show admin toolbar when admin
Merge remote-tracking branch 'origin/master' into dev