1.0.4: fix custom ProguardCache rules

also update to com.android.tools.build 0.5.7
add test case for proguard-cache custom rules
Merge branch 'master' of z:/android/sbt