Merge branch 'master'

Conflicts:
	.DS_Store
	css/Thumbs.db
	images/Thumbs.db
	images/article/Thumbs.db
	images/clients-logos/Thumbs.db
	images/featured/Thumbs.db
	images/full-width-images/Thumbs.db
	images/map-simple-mini.png
	images/map-simple.svg
	images/slider/Thumbs.db
	js/jquery.mb.YTPlayer.js
	mapplic/js/jquery.mousewheel.js
	states.json
fling ds_store
This is fluffing merge comment
eh, fluffing all over again