MOD: finish zd intro
Merge branch 'master' of github.com:sybil63/ArtStudio

Conflicts:
	app/View/Layouts/zd.ctp
MOD: index album view number
Merge branch 'master' of github.com:sybil63/ArtStudio
Merge branch 'master' of github.com:/sybil63/ArtStudio
bugfix