Android on other branch
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	groepI.iml
	pom.xml
Android login + user trips