commit new way
Merge branch 'master' of https://github.com/nathanrp/BFX

Conflicts:
	css/font-awesome/less/mixins.less
	less/font-awesome/less/fa-mixins.less
	less/font-awesome/less/mixins.less