Fix escape when using icons on link
Merge branch 'master' of git://github.com/radig/TwitterBootstrap

Conflicts:
	View/Helper/BootstrapHtmlHelper.php