Add gitignore
Merge branch 'master' into develop
Merge branch 'release/labs1-done'