made Active/Inactive on edit user
Merge remote-tracking branch 'origin/Develop' into Develop