Made bootstrap version of latest dev branch
Added new files
added navbar and modified bootstrap
Merge branch 'dev_bootstrap'