Fix for role user count
EEFOCUS activity template miss
Merge pull request #567 from sexnothing/user

EEFOCUS activity template miss
Merge pull request #568 from adivspan/user-adivspan

Added custom user template front
Merge branch 'user' into user-adivspan
User module bug fixed
Merge remote-tracking branch 'upstream/user' into user
System component form bug fixed
Merge pull request #569 from sexnothing/user

User module bug fixed
System component form bug fixed
Merge pull request #570 from sexnothing/user

System component form bug fixed
Merge branch 'user' into user-adivspan
Fixed user custom template