merge with macbook version
chmod +x
fix errors in osx
fixed osx install
git p4merge
git config for osx
Merge branch 'master' into sansi

* master:
  git config for osx
  git p4merge
  fixed osx install
  fix errors in osx
  chmod +x
  merge with macbook version