Temp commit
Merge branch 'develop' of https://github.com/anandsaw/Reactive-AirQuality into develop

Conflicts:
	AQuaAndroid/src/org/swat/aqua/GraphActivity.java
Merge branch 'develop' of https://github.com/anandsaw/Reactive-AirQuality into develop
Changed the enums
Added the Enum file