df
Merge branch 'rootdev' of https://github.com/nosfik/proj01 into rootdev

Conflicts:
	catalog/view/theme/default/template/album/edit.tpl