updating localhost page
Merge 'bootstrap-new' into development again