image capture mode
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
Scenario events
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
Merge branch 'master' of https://github.com/claytronics/visiblesim
update
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
	BlockSimulator-MT2/simulatorCore/src/blinkyBlocksWorld.h
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml
add smartblock tests
Merge branch 'master' of https://github.com/claytronics/visiblesim

Conflicts:
	BlockSimulator-MT2/applicationsBin/blinky01/config.xml