Lift 2.6 starter template with Bootstrap 3
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
Fixing links in bootstrap documentation
Moving jquery to the head. Fixes "jqury not defined" on login page.
Login page has Bootstrap classes/styles. No more table to align the form elements
Simplifying User. BootstrapUser is WIP and shall be moved to FoBo when
ready. All ProtoUser related localization defaults to lift core i18n
localization but is now overridable by application localization bundles.
The functionality of BootstrapMegaMetaProtoUser is now ready for public
review. This push also contains some bootstrap3 app theme fixes.
Renaming to lift_advanced_bs3 and bumped from snapshot to M1.
Renaming to lift_advanced_bs3 and bumped from snapshot to M1.
Merge branch 'login-bootstrap-style' of https://github.com/lift/lift_26_sbt into login-bootstrap-style

Conflicts:
	scala_210/lift_advanced_bs3/build.sbt
	scala_210/lift_advanced_bs3/project/.gitignore
	scala_210/lift_advanced_bs3/project/build.properties
	scala_210/lift_advanced_bs3/project/plugins.sbt
	scala_210/lift_advanced_bs3/sbt
	scala_210/lift_advanced_bs3/sbt-launch-0.12.1.jar
	scala_210/lift_advanced_bs3/sbt.bat
	scala_210/lift_advanced_bs3/src/main/resources/logback.xml
	scala_210/lift_advanced_bs3/src/main/scala/bootstrap/liftweb/Boot.scala
	scala_210/lift_advanced_bs3/src/main/scala/code/lib/DependencyFactory.scala
	scala_210/lift_advanced_bs3/src/main/scala/code/model/User.scala
	scala_210/lift_advanced_bs3/src/main/scala/code/snippet/HelloWorld.scala
	scala_210/lift_advanced_bs3/src/main/webapp/WEB-INF/web.xml
	scala_210/lift_advanced_bs3/src/main/webapp/assets/css/app-bs-theme.css
	scala_210/lift_advanced_bs3/src/main/webapp/assets/images/ajax-loader.gif
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/css/docs.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/css/pygments-manni.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/ico/apple-touch-icon-114-precomposed.png
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/ico/apple-touch-icon-144-precomposed.png
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/ico/apple-touch-icon-57-precomposed.png
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/ico/apple-touch-icon-72-precomposed.png
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/ico/favicon.png
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/application.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/customizer.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/filesaver.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/holder.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/html5shiv.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/jquery.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/jszip.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/less.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/raw-files.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/respond.min.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/assets/js/uglify.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/browserstack.json
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/components/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/css/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/customize/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/carousel/carousel.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/carousel/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/grid/grid.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/grid/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/jumbotron-narrow/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/jumbotron-narrow/jumbotron-narrow.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/jumbotron/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/jumbotron/jumbotron.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/justified-nav/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/justified-nav/justified-nav.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar-fixed-top/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar-fixed-top/navbar-fixed-top.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar-static-top/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar-static-top/navbar-static-top.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/navbar/navbar.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/non-responsive/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/non-responsive/non-responsive.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/offcanvas/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/offcanvas/offcanvas.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/offcanvas/offcanvas.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/carousel.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/grid.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/jumbotron-narrow.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/jumbotron.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/justified-nav.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/navbar-fixed.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/navbar-static.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/navbar.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/non-responsive.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/offcanvas.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/sign-in.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/starter-template.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/sticky-footer-navbar.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/sticky-footer.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/screenshots/theme.jpg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/signin/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/signin/signin.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/starter-template/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/starter-template/starter-template.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/sticky-footer-navbar/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/sticky-footer-navbar/sticky-footer-navbar.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/sticky-footer/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/sticky-footer/sticky-footer.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/theme/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/examples/theme/theme.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/fonts/glyphicons-halflings-regular.eot
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/fonts/glyphicons-halflings-regular.svg
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/fonts/glyphicons-halflings-regular.ttf
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/fonts/glyphicons-halflings-regular.woff
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/getting-started/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/javascript/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/affix.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/alert.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/button.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/carousel.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/collapse.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/dropdown.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/modal.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/popover.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/scrollspy.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tab.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/phantom.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/server.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/affix.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/alert.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/button.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/carousel.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/collapse.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/dropdown.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/modal.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/phantom.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/popover.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/scrollspy.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/tab.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/tooltip.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/unit/transition.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/vendor/jquery.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/vendor/qunit.css
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tests/vendor/qunit.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/tooltip.js
	scala_210/lift_advanced_bs3/src/main/webapp/bootstrap3/js/transition.js
	scala_210/lift_advanced_bs3/src/main/webapp/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/static/index.html
	scala_210/lift_advanced_bs3/src/main/webapp/templates-hidden/_embededTopNavbar.html
	scala_210/lift_advanced_bs3/src/main/webapp/templates-hidden/_resources.html
	scala_210/lift_advanced_bs3/src/main/webapp/templates-hidden/default.html
	scala_210/lift_advanced_bs3/src/main/webapp/templates-hidden/wizard-all.html
	scala_210/lift_advanced_bs3/src/test/resources/logback-test.xml
	scala_210/lift_advanced_bs3/src/test/scala/RunWebApp.scala
	scala_210/lift_advanced_bs3/src/test/scala/code/snippet/HelloWorldTest.scala
Updated FoBo ProtoUser resource names.
Updates to resource values.
Fix minor English problems. Embedded.
FoBo snippet name changes. see FoBo issue #43 for details
https://github.com/karma4u101/FoBo/issues/43
Merge branch 'login-bootstrap-style' of
https://github.com/lift/lift_26_sbt.git into login-bootstrap-style

Conflicts:
	scala_210/lift_advanced_bs3/src/main/webapp/templates-hidden/_embededTopNavbar.html
Removing hidden-xs attribute from the list group menu.
Boostrap v3 snippet renaming, now prefixed with Bs3*
Updated to FoBo Bootstrap v3.0.1 and FoBo JQuery v1.10.2. Bootstrap doc
updated to v3.0.1
Changing application name to "Lift v2.6 Template Application with
Bootstrap v3"