updated gitignore
Merge branch 'master' into ios_client_2.0