Merge branch '2.0-wip'

Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less

1 files changed, 62 insertions, 0 deletions

diff --git a/docs/build/node_modules/hogan.js/Makefile b/docs/build/node_modules/hogan.js/Makefile
new file mode 100644
index 000000000..922fdead1
--- /dev/null
+++ b/docs/build/node_modules/hogan.js/Makefile
@@ -0,0 +1,62 @@
+REPO = [email protected]:twitter/hogan.js.git
+BUILD := build
+VERSION = ${shell node -e 'var s = JSON.parse(require("fs").readFileSync("package.json").toString()).version; console.log(s.substring(0, s.indexOf("-")));'}
+
+#
+# Run command line tests
+#
+test:
+	@ node test/index.js
+
+#
+# Run Mustache spec tests
+#
+spec:
+	@ node test/spec.js
+
+#
+# Run benchmark
+#
+benchmark:
+	@ node benchmark/console/index.js
+
+clean:
+	@ rm -rf dist/*
+#
+# Make a new version of Hogan from the current dev version.
+#
+release: clean
+	@ echo "Creating a new version of Hogan."
+	@ mkdir -p dist/nodejs
+	@ cp -R lib dist/nodejs/lib
+	@ node tools/release.js
+	@ mkdir -p web/builds/$(VERSION)
+	@ cp dist/*.* web/builds/$(VERSION)/.
+#
+# Make the gh-pages website
+#
+# This target builds the hogan.js github website using hogan.js.
+#
+# cd into build/gh-pages to check in the new site.
+#
+GH_PAGES = $(BUILD)/gh-pages
+web: | pages
+	@cp -R web/* $(GH_PAGES)
+	@@ node tools/web_templates.js
+	@echo
+	@echo "Website built in $(GH_PAGES)."
+
+#
+# Checkout the gh-pages branch.
+#
+pages: | $(BUILD)
+	@if [ ! -d "$(GH_PAGES)" ]; then \
+	git clone -b gh-pages $(REPO) $(GH_PAGES); \
+	rm -rf $(GH_PAGES)/*; \
+	fi;
+	@mkdir -p $(GH_PAGES)/images
+
+$(BUILD):
+	mkdir -p $(BUILD)
+
+.PHONY: test spec benchmark web release