backtrack merge
gitignore update
Merge branch 'master' of https://github.com/ios-developpers/ios-project