remove index.html from master
merge master into develop and fix merge conflict in index.html
introduce bootstrap