User add option created
Merge branch 'master' of github.com:Dwetech/Windowfreak1985

Conflicts:
	admin/user/user.php