Merge remote-tracking branch 'origin/master'

Conflicts:
	zRockBand/css/images/page1-img1.jpg
	zRockBand/css/images/page1-img2.jpg
	zRockBand/css/images/page2-img1.jpg
	zRockBand/css/images/page2-img2.jpg
	zRockBand/css/images/page2-img3.jpg
	zRockBand/css/images/page3-img1.jpg
	zRockBand/css/images/page3-img2.jpg
	zRockBand/css/images/page3-img3.jpg
	zRockBand/css/images/page3-img5.jpg
	zRockBand/css/images/page3-img6.jpg
	zRockBand/css/images/page4-img1.jpg
	zRockBand/css/images/page4-img2.jpg
	zRockBand/css/images/page4-img3.jpg
	zRockBand/css/images/slider-img1.jpg
	zRockBand/css/images/slider-img2.jpg
	zRockBand/css/images/slider-img3.jpg
	zRockBand/css/images/thumb-1.jpg
	zRockBand/css/images/thumb-2.jpg
	zRockBand/css/images/thumb-3.jpg