added mac bundle/app icon; some improvements in mac cpack
resolved icons conflict in cmake file