Merge branch 'master' of https://github.com/cernicc/RecordShop

Conflicts:
	album_images/Animals As Leaders - Joy Of Motion.jpg
	album_images/Arch Enemy - Khaos Legions.jpg
	album_images/Gojira - L'enfant Sauvage.jpg
	album_images/Haunted Shores - Haunted Shores.jpg
	album_images/Intervals - The Space Within.jpg
	album_images/Iron Maiden - The Number Of The Beast.jpg
	album_images/King Diamond - Abigail.jpeg
	album_images/Protest The Hero - Volition.jpg
	album_images/Tesseract - Altered State.jpg
	album_images/Testament - Dark Roots Of The Earth.jpg
	recordshop.sql