Grammar for fecks sake!
Only reference Bootstrap by its major version

Conflicts:
	about.php
Use Spin.js to pimp the loading indicators in flyouts
Merge branch 'master' into bootswatch

* master:
  Use Spin.js to pimp the loading indicators in flyouts
  Only reference Bootstrap by its major version
  Grammar for fecks sake!

Conflicts:
	about.php
	bower.json