guoguo change
guoguo change 1
guoguo change merger
solve merge conflict on admin_model
Merge pull request #6 from nosun/master

[7.19 17:30] get new patch