Updates gitignore
Merge branch 'develop' into submodules