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

Conflicts:
	IliConnect/src/com/android/iliConnect/SchreibtischDetailActivity.java
Exit with double back pressed
Merge branch 'master' of https://github.com/Develman/IliConnect

Conflicts:
	IliConnect/src/com/android/iliConnect/dataproviders/LocalDataProvider.java