neu
Merge branch 'android2013' of https://github.com/mixandmatch/android.git
into android2013

Conflicts:
	pom.xml
	src/main/java/de/metafinanz/mixmatch/activities/MixMatchActivity.java