Merge branch 'master' of github.com:Antpolis/Bootstrap3

Conflicts:
	helpers/BsHtml.php
Merge branch 'master' of github.com:Antpolis/Bootstrap3

Conflicts:
	helpers/BsHtml.php