Test
Merge branch 'fixes' of https://github.com/WebAndCow/CakePHP-Bootstrap-3-HtmlHelper into fixes

Conflicts:
	app/Config/bootstrap.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/PagesController.php
	app/View/Helper/BsHelper.php
	app/View/Layouts/bootstrap.ctp
	app/View/Pages/col.ctp
	app/webroot/css/bootstrap.css
	app/webroot/css/bs_addon.css
	app/webroot/css/style.css
	app/webroot/js/bootstrap.js