Merge branch 'dev'

Conflicts:
	Gruntfile.coffee
	package.json
	static/b/bFooter/bFooter.less
	static/b/bPage/bPage.less
	static/less/media.less