re-merge
Merge branch 'master' of https://github.com/OptimusKe/e-Hentai

Conflicts:
	e-Hentai/MainViewController/MainViewController.m