MA changes
Merge branch 'master' of
ssh://git@github.com/jonaslergell/takemethere.git

Conflicts:
	src/com/takemethere/MainActivity.java
deleted old MA