new bootsrtap files
unnecessary files deleted
Merge branch 'master' into bootstrap3
bootstrap 3 migration finished