Merge remote-tracking branch 'upstream/user' into user
Merge branch 'user' into user-adivspan
Merge remote-tracking branch 'upstream/user' into user
Fixed the user module front template
Merge branch 'user' into user-adivspan
Fix time to date string
Merge pull request #488 from liuchuangww/user

Fix time to date string
Merge branch 'user' into user-adivspan
Merge pull request #489 from adivspan/user-adivspan

Fixed the user module front template
Merge remote-tracking branch 'upstream/user' into user
Sytem perm page done
Merge pull request #491 from sexnothing/user

Sytem perm page done
Fix for text
Restored theme css
Text correction
Escape database information for security consideration
Renamed registry profile to profile_field
File cleaning up
Fetch table columns from metadata
Code cleaning up