initial commit
Merge branch 'master' of https://github.com/lanceon/lift-twitter-bootstrap-template
merged with upstream

Conflicts:
	.gitignore
	README.md
	build.sbt
	src/main/resources/logback.xml
	src/main/scala/bootstrap/liftweb/Boot.scala
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.html
	src/main/webapp/templates-hidden/default.html
	src/main/webapp/test.html