Version name 1.1, version code 2
Merge branch 'devel' into release
Merge branch 'release'