Adding album list
Merge branch 'jmp' of https://github.com/Parametric/PyCamp into jmp

Conflicts:
	templates/PyCampApp/artist_detail.html