asdasdasd
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/default/files/styles/slider-blog/public/ima2BCC.tmp.gif
	sites/default/files/styles/slider-blog/public/ima426E.tmp.gif