updating Proguard and feedback for release.
Merge branch 'master' of https://github.com/Morji/Project-Bananahammock

Conflicts:
	PBH/app/src/main/java/com/rockspin/bargainbits/activities/DealsActivity.java
	PBH/app/src/main/res/values/strings.xml