added the featureNew
Create a test class
WakeLock added to turn screen on.
Merge branch 'featureNew'
Add a commented line
Merge branch 'myfeature'

Conflicts:
	sensor_android/src/com/example/sensor_android/SensorActivity.java
test
Test commit
Some changes