Merge branch 'master' of https://github.com/miong/Simula

Conflicts:
	Dev_Simula_V1.1/src/main/scala/simula/adapters/ModelEngineAdapter.scala
	Dev_Simula_V1.1/src/main/scala/simula/common/GameRuleInterface.scala
	Dev_Simula_V1.1/src/main/scala/simula/common/SideEffectInterface.scala
	Dev_Simula_V1.1/src/main/scala/simula/engine/AbstractModel.scala
	Dev_Simula_V1.1/src/main/scala/simula/engine/Engine.scala
	Dev_Simula_V1.1/src/main/scala/simula/model/ModelInterface.scala
	Dev_Simula_V1.1/src/main/scala/simula/model/city/City.scala
	Dev_Simula_V1.1/src/main/scala/simula/model/effects/NoFx.scala
	Dev_Simula_V1.1/src/main/scala/simula/model/rules/Nop.scala
	Dev_Simula_V1.1/src/main/scala/simula/time/Clock.scala
Revert 6569d4d..975833d

This rolls back to commit 6569d4d021aac2db424cd752c0fedaa202ca2d31.
Go back
Revert 975833d..9d0fb53

This rolls back to commit 975833dabe062aabf89eb2c2d7924f73aae399a1.
mod
Revert 6569d4d..4135106

This rolls back to commit 6569d4d021aac2db424cd752c0fedaa202ca2d31.
Merge branch 'master' of https://github.com/miong/Simula