fixed bugs
Merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git

Conflicts:
	client/src/ch/uzh/csg/mbps/client/AbstractLoginActivity.java
reverted to Jetons version