Added Android annotations.
Merge branch 'develop'