lol
Merge branch 'master' of https://github.com/Tucsky/Bootstrap

Conflicts:
	tpl-apropos.php