Map testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	RecyclePunch/AndroidManifest.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit f8fbea03b6b4e4a912c15d1913e314873be0f6b9.
Revert "Map testing"

This reverts commit 870f824aad33131105189d7c814c99d8b5c7bde9.