base commit from mbp
Merge branch 'master' of https://github.com/DavidPhilip/bootstrap

Conflicts:
	less/buttons.less
	less/fonts.less
	less/general.less
	less/home.less
	less/mixins.less
	less/modals.less
	less/navbar.less
	less/variables.less