[Issue #193] Fixed documentation
[Issue #193] Fixed uml
Merge pull request #338 from MGhanem/fix_master

fixed routes deleted by merge conflict
fixed routes deleted by merge conflict
fixing routes
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into play
Merge pull request #339 from MGhanem/play

Play
[#90][WIP] changed method from approve_keyword to disapprove_keyword
[#90][WIP] updated test to be for disapproval
[#90][WIP] updated documentation for disapproval
[#90][finished] updated UML for disapproval
[#90][MC] solved merge conflicts with master
[#81][WIP] updated UML for disapproval
[#81][WIP] changed method from approve to disapprove
[#81][WIP] updated documentation from approval to disapproval
[#81][WIP] updated test for disapproval
[#81][finished] forgot to add self. for method
fixed merge conflicts in admin theme
[#181][WIP] checked code convetions
[#181][WIP] added missing end in my_subscription causing errors