Adding page progFencing to facing geoFencing

fake'n'bake
Merge remote-tracking branch 'origin/master'

Conflicts:

	workspace/RoadsideAssistance/src/main/webapp/WebContent/pages/progIndex.jsp