Code cleaning up
Merge branch 'develop' into user
Merge branch 'user' into permission