14.06.14 20:12
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/de/maka/vertretungsplanapp/ExpandableListAdapter.java
	app/src/main/java/de/maka/vertretungsplanapp/MainActivity.java