[FIX]Issue of trunk in website branch.
[MERGE] Some fix for bootstrap issues