Use android support annotations
Merge branch 'dev'