[ME,MJ]{other} stupid test removed
Merge branch 'client' of github:heinzburgstaller/sw14_xp_01 into client

Conflicts:
	HoiMessengerUnitTest/src/at/tugraz/sw/hoi/messenger/test/ChatActivityTest.java
	HoiMessengerUnitTest/src/at/tugraz/sw/hoi/messenger/test/ContactsFragmentTest.java