Add bootstrap to wrapper of app
Merge remote-tracking branch 'origin/master'