gui update
Merge branch 'bootstrap3' into GUI