Merge branch 'master' into better-structure

Conflicts:
	bootstrap-shortcodes.php
	inc/bs_alert.php
	inc/bs_buttons.php
	inc/bs_collapse.php
	inc/bs_grid.php
	inc/bs_icons.php
	inc/bs_lead.php
	inc/bs_tabs.php
	inc/bs_tooltip.php
	inc/bs_well.php
	js/plugins/alert.js
	js/plugins/well.js
Merge branch 'better-structure' of https://github.com/No3x/bootstrap-shortcodes into better-structure