Merge remote-tracking branch 'upstream/master' into fix-834-deprecate-bootstrap
Merge remote-tracking branch 'origin/fix-834-deprecate-bootstrap' into fix-834-deprecate-bootstrap
Make twitterBootstrap usage in the samples look exactly like the module.  Remove the twitter bootstrap module and the project definition.