Revert "Merge remote-tracking branch 'base/master'"

This reverts commit 2b8c62fcdbc5218a83230e05cdce7e29b43b2348, reversing
changes made to 1336636db1195784cdb2c85b384ed525fd82c0ce.

Conflicts:
	app/controllers/rb_taskboards_controller.rb