accept_request view added
Merge branch 'master' into accept_request
merge accept with master
better file structure