login
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidTeamF/src/main/java/teamf/controller/ServerCaller.java
	AndroidTeamF/src/main/java/teamf/controller/methods/login.java
	AndroidTeamF/src/main/java/teamf/model/Chat.java
	AndroidTeamF/src/main/java/teamf/model/Deelname.java
	AndroidTeamF/src/main/java/teamf/model/Kost.java
	AndroidTeamF/src/main/java/teamf/model/Trip.java
	AndroidTeamF/src/main/java/teamf/view/Login.java
login