Update deprecated gradle construct
Target android SDK version 20
Remove unused and overridden attributes from manifest
Merge branch 'lint-errors'