Minor updates.
Merge branch 'master' of https://github.com/TrimDich/trimm-dich.git

Conflicts:
	TrimmDich/src/de/lmu/msp/trimmdich/summary/MapResultActivity.java
Overriding Back Button.