Imported upstream version 2.4+git20130310
Imported Upstream version 2.4+git20130615
Merge conflict
update changelog
Removed patch 4 (fixed upstream)
use release build type
Remove Install of ColorFrag shader from ccViewer (it comes already with qCC)
update copyright file