* Clean up some comments
Merge branch 'master' of https://code.google.com/p/open-lighting
Merge pull request #478 from nomis52/master

Add the missing doxygen example program
Fix typo in common/io/ExtendedSerial.cpp.
Merge pull request #479 from Jurrie/bugfix/UartDMX_preprocessor_typo

Fix typo in common/io/ExtendedSerial.cpp.
Merge branch 'master' of https://code.google.com/p/open-lighting
Merge branch 'master' of github.com:OpenLightingProject/ola

Conflicts:
	common/rpc/RpcPeer.h