select working
starting changes to implement bootstrap
updates on bootstrap
updates
before merge
Merge branch 'bootstrap'

* bootstrap:
  updates
  updates on bootstrap
  starting changes to implement bootstrap

Conflicts:
	js/dist/built.min.js
	partials/html/login.html