Added better comments
Fixed a lot of smaller unit-tests. Also moved some tests - which require local resources - to pending, so it might work on Travis again.
Added 5 sec wait after Jetty was started.
Merge remote-tracking branch 'origin' into conceptual_model