Updated build tools version.
Added proguard.
Added proguard.
Updated gralde scripts.
Merge branch 'develop'