add bootstrap confirm pieces
Merge branch 'bootstrap-confirm' into bootstrap-confirm2
bootstrap modal confirms
order groups and users to close #593
add tooltips to group permissions to close #445
Changed button CSS classes across app to better conform with bootstrap standards and show primary button shading properly on bootstrap confirm modals
Merge pull request #592 from concerto/bootstrap-confirm2

Bootstrap confirm modals - merging to close #429
Fixed a couple button classes
add devise confirmable and make it controlled by a config variable. closes #337
make heading consistant
add in HTML 5 character encoding
alert the user to restart the web server #387
Merge branch 'master' into rails-4

* master:
  alert the user to restart the web server #387
  add in HTML 5 character encoding
  make heading consistant
  add devise confirmable and make it controlled by a config variable. closes #337
  Fixed a couple button classes
  Changed button CSS classes across app to better conform with bootstrap standards and show primary button shading properly on bootstrap confirm modals
  add tooltips to group permissions to close #445
  order groups and users to close #593
  bootstrap modal confirms
  add bootstrap confirm pieces

Conflicts:
	Gemfile.lock
	db/schema.rb