Imported current code from mangasocial and additional changes from PR90
switched to dev branch for testing
Reverted from dev