返回相册、删除相册、已经设为封面的、点击查看大图
Merge branch 'master' of https://github.com/HeraldStudio/herald_league

Conflicts:
	herald_league/Conf/config.php