fix version number
add __bridge as requested
Merge pull request #1 from comoyo/commac-212

Fix mac specific code for version number
put back comment out flags
Merge pull request #2 from comoyo/flag_fix

put back commented out flags checks
Merge branch 'comoyo-fork' into comoyo-talkplus-fork