merged backbonejs branch. some fixes. removed files