Fixed variable names, added documentation to ProcessAndSend class
Merge branch 'proximity_fix' of https://github.com/senseobservationsystems/sense-android-library.git into proximity_fix

Conflicts:
	src/nl/sense_os/service/phonestate/ProximitySensor.java
Changed proximity data format from JSON to float; scaled proximity data
from centimeters to meters; made ProximitySensor class extend BaseSensor