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

Conflicts:
	app/src/main/java/org/aieseclchku/im/tap_in/EventArrayAdapter.java
	app/src/main/java/org/aieseclchku/im/tap_in/EventListFragment.java
	app/src/main/res/layout/fragment_event_list.xml
from alan 31/12