bootstrap-3.1.1
update js
Merge branch 'master' into meiban_dev