Updated proguard rules.
Merge branch 'develop'