* Blackmore is being migrated to bootstrap.
Merge branch 'master' of https://github.com/larukedi/Scabbia-Framework

Conflicts:
	resources/blackmore/blackmore.css