Moved .gitignore to global
Merge branch 'develop'