Merge pull request #344 from sexnothing/user

User
Added parameters to User::Data
Restore overwritten file
Display text correction
Doc updates
Fix for $this in anonymous functions prior to PHP 5.4
Perm page in system module