Refactoring
Merge branch 'master' of https://github.com/cnduru/sw7_frontend

Conflicts:
	Seven/app/src/main/java/sw7/cornfield/MainActivity.java
Fixes to my last commit