Update proguard relative to #52.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/proguard.cfg