edit user done, wel nog hard coded username, pls someone pass me username in string ?
Merge origin/InDev into InDev