Merge branch 'staging'
edit .gitignore
Merge branch 'master' into develop