Removes parameter $administrator from useredit
Merges izend/master