Merge branch 'android/butterknife' into bug/cab

Conflicts:
	gradle/android/src/androidTest/java/bbct/android/common/activity/test/BaseballCardListWithDataTest.java