Removed the conflicts
Merge pull request #231 from nmurugesu/master

Added "Sencha Touch BFB Boiler Plate Sample" to the repo.