Merge pull request #6 from JaredBanyard/master

Added AWS 2.1.5 Proguard File
Fix for ButterKnife

Taken from pull request @ https://github.com/JakeWharton/butterknife/pull/161
Merge pull request #7 from jozuasijsling/patch-1

Fix for ButterKnife