Vorlesungsplan

Commit mit Vorlesungsplan via PDF-API --> Nicht lauffähig
Merge branch 'master' of https://github.com/Beware92/ProjectHTWAPP

Conflicts:
	HTW-App/AndroidManifest.xml
	HTW-App/bin/AndroidManifest.xml
	HTW-App/bin/HTW-App.apk
	HTW-App/bin/classes.dex
	HTW-App/bin/classes/com/example/htw_app/R$id.class
	HTW-App/bin/classes/com/example/htw_app/R$layout.class
	HTW-App/bin/classes/com/example/htw_app/R$menu.class
	HTW-App/bin/classes/com/example/htw_app/R$raw.class
	HTW-App/bin/classes/com/example/htw_app/R$string.class
	HTW-App/bin/classes/com/example/htw_app/R$style.class
	HTW-App/bin/classes/com/example/htw_app/StundenplanActivity.class
	HTW-App/bin/classes/com/example/htw_app/mensaplan/SpeiseplanCAS.class
	HTW-App/bin/classes/com/example/htw_app/mensaplan/SpeiseplanCRB.class
	HTW-App/bin/classes/com/example/htw_app/mensaplan/SpeiseplanCRP.class
	HTW-App/bin/classes/com/gebaeudeplan/DatabaseHelper.class
	HTW-App/bin/classes/com/gebaeudeplan/GebaeudeplanActivity.class
	HTW-App/bin/classes/com/gebaeudeplan/RoomSearchActivity.class
	HTW-App/bin/resources.ap_
	HTW-App/gen/com/example/htw_app/R.java
	HTW-App/res/values/strings.xml