from alan 31/12
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/aieseclchku/im/tap_in/EventListFragment.java
from alan 31/12