Colored diagnostics
Merge commit 'f2fd423399606120ef14df43f557757a8a20bc06' into paintserver

Conflicts:
	CMakeLists.txt
And another revert. Now all commits from master re back in paintserver. (Except an unnescessary bugfix)