Lift 2.6 starter template with Bootstrap 3
Merge branch 'migrated_2.5_to_2.6' of
https://github.com/lift/lift_26_sbt into migrated_2.5_to_2.6

Conflicts:
	scala_210/lift_basic_bs/src/main/scala/bootstrap/liftweb/Boot.scala
	scala_210/lift_basic_bs/src/main/webapp/assets/css/app-theme.css
	scala_210/lift_basic_bs/src/main/webapp/index.html