test
Merge branch 'mac-master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/resources.ap_
	bin/uwatimetable.apk
	src/com/github/marco9999/uwatimetable/MainActivity.java
	src/com/github/marco9999/uwatimetable/MainFragmentOverview.java
- Mac ds store crap
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store
test