Merge pull request #19 from tomerghelber/feature/split-reloaded-anime-and-manga

Feature/split reloaded anime and manga
Revert "Feature/split reloaded anime and manga"
Merge pull request #20 from tomerghelber/revert-19-feature/split-reloaded-anime-and-manga

Revert "Feature/split reloaded anime and manga"
Merge branch 'develop' into feature/test-search

Conflicts:
	pymal/anime.py
	pymal/inner_objects/media.py
	pymal/manga.py
	tests/test_anime.py
	tests/test_manga.py