album template added
album template added
Merge origin/master

Conflicts:
	templates/albums.tpl