updated version
removed bundle icon, xcode submit is angry about it
removed obsolete #defines
Merge branch 'release/2.3.0' into devel