gsm testing
Merge branch 'master' of github.com:cnduru/sw7_frontend

Conflicts:
	Seven/app/src/main/java/sw7/cornfield/GPSListener.java