Merge pull request #311 from sexnothing/user

User template in system module
Removed order from role form/validator