gps and to server test
Merge branch 'master' of https://github.com/cnduru/sw7_frontend

Conflicts:
	Seven/app/src/main/java/sw7/cornfield/MainActivity.java
	Seven/app/src/main/res/layout/activity_main.xml