Mark

Merging Mark branch with master.

Main.java :8ball: Deleted javadoc & unused imports.

updated :100: doc/UML.astah to V3.

added :1234: Truck.java in package containing.transport.
added :1234: Train.java in package containing.transport.
added :1234: Wagon.java in package containing.transport.

PS: watch the dlls!