added butterknife 5.1.0 and Crouton framework
Merge remote-tracking branch 'origin/master'