Kysa (11/4)
Merge remote-tracking branch 'origin/master'

Conflicts:
	IntelliGrid/src/org/sdsu/intelligrid/simulation/Simulation.java