Add a possibility to scale the full image view
Add else
Merge branch 'master' of https://github.com/redlabrat/MozartWear

Conflicts:
	MozartTest/.classpath
	MozartTest/src/com/redlabrat/mozarttest/CollectionActivity.java
	MozartTest/src/com/redlabrat/mozarttest/helpers/DataLoadingService.java
	MozartTest/src/com/redlabrat/mozarttest/helpers/FileHelper.java
	MozartTest/src/com/redlabrat/mozarttest/helpers/ImageHelper.java