update
Merge branch 'BenV_1'

Conflicts:
	M3.Website/Resources/js/album/jquery.galleryview-1.0.js