sql returns bomber
local
init
blah
Merge origin/master

Conflicts:
	src/main/java/SQL/SQLHandler.java
ADD GCM
Merge origin/master
a
gcm done
gcm using plain/text
added id to bomber return from sql.
Merge origin/master

Conflicts:
	src/main/java/GCM/GCMMessageReceiver.java
	src/main/java/SQL/SQLHandler.java
	src/main/java/boom/BomberResource.java