added some more objects
Merge branch 'SkymorphTO' of github.com:hughes/SkymorphTO into SkymorphTO

Conflicts:
	v2/web/templates/friendly.html
Merge branch 'SkymorphTO' of github.com:hughes/SkymorphTO into SkymorphTO