manifest, proguard update
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	library/proguard-unity.txt