commit
Merge branch 'master' of https://github.com/cnpisit/Ankor.people

Conflicts:
	module/Album/view/album/index/index.phtml
	module/Album/view/album/users/index.phtml