Merge branch 'release/v1.0'
Merge branch 'release/v1.1'
actual v1.1, had to bump build number too to make it work
Merge branch 'master' into develop