minor fix
moved fixed properties to header area
resovled merge conflict
added sidebar to single objects page
Merge branch 'objects' of github.com:mozboz/odd-scoperomic into editor

Conflicts:
	client/views/objects/object_page.html
	client/views/objects/object_page.js
	lib/router.js