Added target GCMSender
Merge branch 'TRIPLESLASH' of https://github.com/smitparaggua/thesis-clean into LINEDRIVE
added popup, not yet working
Merge branch 'TRIPLESLASH' of https://github.com/smitparaggua/thesis-clean into TRIPLESLASH

Signed-off-by: yar0794 <csg-danraysmit@CSGs-iMac.local>

Conflicts:
	AndroidWarrior/src/com/csg/warrior/SettingsActivity.java
	TestServer/src/main/java/com/csg/warrior/controller/GCMSender.java