messaging
Merge branch 'master' of https://github.com/BennyFischer/nomof

Conflicts:
	nomof.v11.suo