small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	simulation.py
added a light frontier class
frontierDiv and frontierLight
Merge remote-tracking branch 'origin/master'
Merge branch 'localw'