final adjustments
Merge branch 'master' of https://github.com/TrimDich/trimm-dich

Conflicts:
	TrimmDich/src/de/lmu/msp/trimmdich/run/RunPreviewActivity.java