Fixed Issue #26
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
bug for perm-admin perm-front
Merge pull request #37 from sexnothing/master

bug for per-admin per-front