Merge branch 'master' of https://github.com/king89/MangaPicker

Conflicts:
	src/MangaPicker/web/Main.py
	src/MangaPicker/web/MangaWebSite.py
Merge branch 'master' of https://github.com/king89/MangaPicker

Conflicts:
	src/MangaPicker/web/MangaWebSite.py