Updated proguard settings.
Merge branch 'develop' of https://github.com/RoboBinding/RoboBinding into develop

Conflicts:
	framework/proguard-rules.pro