Merge branch 'master' of https://github.com/apps8os/trafficsense.git

Conflicts:
	AlarmTest/.classpath
	experiment/AndroidAlarmService/res/layout/main.xml
	experiment/AndroidAlarmService/res/values/strings.xml
	experiment/AndroidAlarmService/src/com/exercise/AndroidAlarmService/AndroidAlarmService.java
	experiment/AndroidAlarmService/src/com/exercise/AndroidAlarmService/MyAlarmService.java
	experiment/AndroidAlarmService/src/com/exercise/AndroidAlarmService/ResponseReceiver.java

Signed-off-by: Javier López Lumbreras <loplumja@hotmail.com>
Merge branch 'master' of https://github.com/apps8os/trafficsense

Conflicts:
	FirstProtoApp/src/org/apps8os/trafficsense/first/MainActivity.java