Changed Sensor to GenericSensor and made Sensor a subclass of Generic
Sensor. Sensor represents the Android Sensor and GenericSensor
represents the sensors external to the Smartphone.
Merge pull request #11 from RARyan/RobMasterBranch

2-July-2014:1800