Added our Messenger system into Basis
Merge remote-tracking branch 'origin/master' into Craig

Conflicts:
	CMakeLists.txt