implemented more functionality in the mock server
added new valid values to the validation method
updated eclipse project files
Removed getChannelId() method, because it was a duplicate of getID()
fixed tests to run with the changes in DVBChannel
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	.project
add bin