Merge branch 'release/v1.1'
Merge branch 'release/v2.0'
added tilda ignores
Merge branch 'master' into develop