Updated proguard.
Merge branch 'develop'