works on my device, not on my compy
Friends selector works
Merge remote-tracking branch 'origin/Planit_Friendly_Edition'

Conflicts:
	app/src/main/java/planit/planit/EventActivity.java
	app/src/main/java/planit/planit/event/EventAdapter.java