working version
working version
remove unused imports
Merge branch 'master' into develop-mb

Conflicts:
	client/pom.xml
	client/src/ch/uzh/csg/mbps/client/AbstractLoginActivity.java
	client/src/ch/uzh/csg/mbps/client/LoginActivity.java
	client/src/ch/uzh/csg/mbps/client/RegistrationActivity.java
	client/src/ch/uzh/csg/mbps/client/util/Constants.java