Alle Alerts eingefügt
Merge branch 'master' of https://github.com/Develman/IliConnect

Conflicts:
	IliConnect/src/com/android/iliConnect/MessageBuilder.java
	IliConnect/src/com/android/iliConnect/QR.java
	IliConnect/src/com/android/iliConnect/SchreibtischDetailActivity.java
	IliConnect/src/com/android/iliConnect/message/QROnClickListener.java