Merge branch 'release/26092013-initial'
Added ignore file
Merge branch 'hotfix/add-gitignore' into develop
Mac OSX ignore