Merge branch 'release/v2.1'
Saving proguard mapping.
Bump version.
Tablets landscape mode - sketch.
Merge branch 'master' into devel