transporter impl
Merge origin/master
transporter working fine
Merge origin/master

Conflicts:
	src/model/environment/Base.java
	src/model/environment/Environment.java
Merge origin/master

Conflicts:
	src/model/environment/Base.java
	src/model/environment/Environment.java