handle objects with no composition
minor - sort object composition
Merge branch 'master' of github.com:typpo/asterank

Conflicts:
	v2/web/templates/asteroid.html