Bugs removed, entity_status table re added, work status column added in entity
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14
Bugs removed
bugs removed again
Friendship controller
Add details to entities corrected
Friendship controller removed
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C4_omar_elmenawy_retrieve_password_#130
Documentation problems and method errors fixed.