1.2
Kursbrowsing nahezu fertig
1.2 
Merge branch 'master' of https://github.com/Develman/IliConnect.git

Conflicts:
	IliConnect/res/layout/uebersicht_layout.xml
	IliConnect/src/com/android/iliConnect/Dozent_kurse.java
	IliConnect/src/com/android/iliConnect/MainActivity.java
	IliConnect/src/com/android/iliConnect/MainActivityAnzeige.java
	IliConnect/src/com/android/iliConnect/QR.java
	IliConnect/src/com/android/iliConnect/Uebersicht.java
	IliConnect/src/com/android/iliConnect/models/Desktop.java
	android/bin/classes/com/google/zxing/client/android/BeepManager.class
	android/bin/classes/com/google/zxing/client/android/CaptureActivity.class
	android/bin/classes/com/google/zxing/client/android/CaptureActivityHandler.class
	android/bin/classes/com/google/zxing/client/android/Contents.class
	android/bin/classes/com/google/zxing/client/android/DecodeFormatManager.class
	android/bin/classes/com/google/zxing/client/android/DecodeHandler.class
	android/bin/classes/com/google/zxing/client/android/DecodeThread.class
	android/bin/classes/com/google/zxing/client/android/HelpActivity.class
	android/bin/classes/com/google/zxing/client/android/HttpHelper.class
	android/bin/classes/com/google/zxing/client/android/InactivityTimer.class
	android/bin/classes/com/google/zxing/client/android/LocaleManager.class
	android/bin/classes/com/google/zxing/client/android/R$array.class
	android/bin/classes/com/google/zxing/client/android/R$color.class
	android/bin/classes/com/google/zxing/client/android/R$drawable.class
	android/bin/classes/com/google/zxing/client/android/R$id.class
	android/bin/classes/com/google/zxing/client/android/R$layout.class
	android/bin/classes/com/google/zxing/client/android/R$raw.class
	android/bin/classes/com/google/zxing/client/android/R$string.class
	android/bin/classes/com/google/zxing/client/android/R$xml.class
	android/bin/classes/com/google/zxing/client/android/ViewfinderView.class
	android/bin/classes/com/google/zxing/client/android/book/NetworkWorker.class
	android/bin/classes/com/google/zxing/client/android/book/SearchBookContentsActivity$1.class
	android/bin/classes/com/google/zxing/client/android/book/SearchBookContentsActivity.class
	android/bin/classes/com/google/zxing/client/android/book/SearchBookContentsAdapter.class
	android/bin/classes/com/google/zxing/client/android/book/SearchBookContentsListItem.class
	android/bin/classes/com/google/zxing/client/android/camera/AutoFocusCallback.class
	android/bin/classes/com/google/zxing/client/android/camera/CameraConfigurationManager.class
	android/bin/classes/com/google/zxing/client/android/camera/CameraManager.class
	android/bin/classes/com/google/zxing/client/android/camera/PreviewCallback.class
	android/bin/classes/com/google/zxing/client/android/encode/EncodeActivity.class
	android/bin/classes/com/google/zxing/client/android/encode/MECARDContactEncoder.class
	android/bin/classes/com/google/zxing/client/android/encode/QRCodeEncoder.class
	android/bin/classes/com/google/zxing/client/android/encode/VCardContactEncoder.class
	android/bin/classes/com/google/zxing/client/android/history/HistoryActivity.class
	android/bin/classes/com/google/zxing/client/android/history/HistoryItem.class
	android/bin/classes/com/google/zxing/client/android/history/HistoryItemAdapter.class
	android/bin/classes/com/google/zxing/client/android/history/HistoryManager.class
	android/bin/classes/com/google/zxing/client/android/result/AddressBookResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/CalendarResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/EmailAddressResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/GeoResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/ISBNResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/ProductResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/ResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/SMSResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/TelResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/TextResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/URIResultHandler.class
	android/bin/classes/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.class
	android/bin/classes/com/google/zxing/client/android/result/supplement/KillerCallable.class
	android/bin/classes/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.class
	android/bin/classes/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.class
	android/bin/classes/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.class
	android/bin/classes/com/google/zxing/client/android/share/AppPickerActivity.class
	android/bin/classes/com/google/zxing/client/android/share/BookmarkAdapter.class
	android/bin/classes/com/google/zxing/client/android/share/BookmarkPickerActivity.class
	android/bin/classes/com/google/zxing/client/android/share/LoadPackagesAsyncTask.class
	android/bin/classes/com/google/zxing/client/android/share/ShareActivity.class
	android/bin/classes/com/google/zxing/client/android/wifi/WifiConfigManager$1.class
	android/bin/classes/com/google/zxing/client/android/wifi/WifiConfigManager.class