Fixing issue where injection was in the wrong place and upgrading butterknife.