Slight refactoring of MP related stuff
Merge branch 'master' of https://github.com/rfcx/rfcx-client-android

Conflicts:
	src/com/rfcx/android/activities/RainforestActivity.java