gallery

- [create album] finished
- [upload image] preview
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/controller/article.php

merge
fix article controller