rearranged order of menu
oops, bug fix
reverted how we are handling the user model back to original RainLab model
Merge branch 'master' into group-feature

* master:
  reverted how we are handling the user model back to original RainLab model
  oops, bug fix
  rearranged order of menu

Conflicts:
	models/User.php