* Clean up some comments
Merge branch 'master' of https://code.google.com/p/open-lighting
Merge branch 'master' of https://code.google.com/p/open-lighting
Merge branch 'master' of github.com:OpenLightingProject/ola

Conflicts:
	common/rpc/RpcPeer.h
Merge pull request #481 from nomis52/master

Comment cleanup