merge to bootstrap v3.0
merge to bootstrap v3.0
Merge remote-tracking branch 'origin/master'
Merge pull request #89 from xiechao06/dev

Dev