Admin`s view for "User Details " ->  Buttons "Cancel" and "Edit" are aligned as mock-up
Merge remote-tracking branch 'origin/Develop' into Develop