added method to retrieve all annotation for given media-id + version
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/at/ait/dme/yuma/server/controller/AnnotationController.java