Blabla
Merge branch 'bootstrap' of github.com:TheBB/aligulac into bootstrap

Conflicts:
	resources/css/aligulac-theme.css