Updated
New Update
ALL
Up
YESYES
Merge remote-tracking branch 'remotes/building_update/master'

Conflicts:
	src/main/scala/org/amcgala/vr/BotAgent.scala
	src/main/scala/org/amcgala/vr/HeartBeat.scala
	src/main/scala/org/amcgala/vr/Main.scala
	src/main/scala/org/amcgala/vr/Simulation.scala
	src/main/scala/org/amcgala/vr/building/TownHall.scala
	src/main/scala/org/amcgala/vr/package.scala