Added ContactUs and AboutUs page
fix merge 1
Merge fix 2
Merge branch 'master' into mergefix
Merge remote-tracking branch 'origin/master'

Conflicts:
	FRPapp/res/values/strings.xml
	FRPapp/src/phillykeyspots/frpapp/MainActivity.java