Enhancement from GA1 in GitHub.
Merge branch 'ga1.1' of https://github.com/chenhongbao/adminsys into ga1.1