Rename branches controller spec
Merge branch 'bebanjo' into rails4.1

* bebanjo:
  Rename branches controller spec