Sinc
Merge remote-tracking branch 'origin/master'

Conflicts:
	media/bsimages/thumbs/banner-foral-2.jpg
	media/bsimages/thumbs/banner-franja-2.jpg