Update proguard-project.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	proguard-project.txt