Initialize android-webpage branch
Add button and activity switch
Merge remote-tracking branch

'origin/android-webpage' into android

Conflicts:
	FrugalDrive/src/com/frugaldrive/frugaldrive/OpenStreetMapActivity.java