Merge pull request #1 from drayfar/master

Update proguard-project.txt
Merge pull request #2 from drayfar/master

Revert test change
test
Merge pull request #3 from TeamPalmTree/test

test
Merge pull request #1 from TeamPalmTree/master

Pulling from TPT