Object Store fix.
Merge branch 'master' of
https://github.com/learning-layers/Cloud-Video-Transcoder.git

Conflicts:
	ClViTra_2.0/pom.xml
	ClViTra_2.0/src/main/java/de/dbis/services/GetProperty.java
	ClViTra_2.0/src/main/java/de/dbis/services/ObjectStore.java
	ClViTra_2.0/src/main/java/de/dbis/services/Thumbnail.java