Use byebug instead debugger
Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'bebanjo' into rails4.1

* bebanjo:
  Use byebug instead debugger Conflicts: 	Gemfile 	Gemfile.lock

Conflicts:
	Gemfile.lock