Merge remote-tracking branch 'origin/master'
Added Twitter bootstrap
Merge branch 'master' into staging