layout
Merge branch 'master' of https://github.com/Develman/IliConnect

Conflicts:
	IliConnect/src/com/android/iliConnect/Uebersicht.java