changed data model for better tracking of assets, made service for collection asset data, hooked up images to em, etc, etc
Merge branch 'master' of github.com:entermedia-community/app-workspace

Conflicts:
	src/org/entermedia/websocket/annotation/AnnotationServer.java