Exception added
Merge branch 'martin'

Conflicts:
	LANReader/src/at/LANReader/LANReader.java
	LANReader/src/at/LANReader/MainClass.java
	LANReader/src/at/LANReader/gui/gui.java
	libraryLANReader/src/at/detego/LANReader/Request.java
merge problems resolved
table added