Update.
Fixing annotations obtaining problems when using proguard.
Updated.
Updated.
Merge branch 'develop'