ran's local pre testing
Merge branch 'master' of https://github.com/ranocohen/redcoloralert.git

Conflicts:
	redcolor/src/com/alert/redcolor/MainActivity.java
location services + partially in gcm service