Add :dependent => destroy to some models. Add some more stubs to brackets controller
Fix merge conflicts