commit
commit
commit
complelte funtion ->administrator item/itemCategory
commit
Merge branch 'master' of https://github.com/finpo/alala-age.git

Conflicts:
	alala/.DS_Store
	alala/public/.DS_Store