Updates.
Merge branch 'master' of https://github.com/Newbourne/Blandx

Conflicts:
	Blandx.v12.suo
	Blandx/Blandx.csproj
	Blandx/packages.config