Merge pull request #790 from greezybacon/feature/user-import

include/ajax.orgs.php

include/ajax.users.php

include/class.dynamic_forms.php

include/class.orm.php

include/class.user.php

include/staff/templates/user-import.tmpl.php

include/staff/templates/users.tmpl.php

include/staff/users.inc.php

scp/ajax.php

scp/orgs.php

scp/users.php

setup/cli/modules/user.php