Merge pull request #34 from plsm/master

Corrected merging bug. Merging.
Adding color changing to bees. Updated vibration messages.
Fixed build errors that appeared due to changes to vibration messages. Vibration actuation and sensing is currently commented out of CasuHandler.cpp
Implemented headless simulation and bee scale factor.
Added bee color changing.
Pulled in vibration message definition changes.
Fixed errors due to new vibration message definitions.
Merge branch 'master' of https://github.com/larics/assisi-playground

Conflicts:
	handlers/CasuHandler.cpp
Merge branch 'master' of https://github.com/larics/assisi-playground

Conflicts:
	msg