add bootstrap.
update angularjs.
Merge remote-tracking branch 'origin/master'