Added backbone.layoutmanager
Solved conflicts