updated .gitignore
Merge branch 'live' into dev