new build
Merge branch 'refs/heads/dev'

Conflicts:
	responsiveImages.coffee
new build