attached approve button to user
Merge branch 'master' into reg26
Merge branch 'reg26'
merge