ireadery
Merge branch 'master' of https://github.com/pymmrd/ireader
Merge branch 'master' of https://github.com/pymmrd/ireader

Conflicts:
	ireader/ireader/settings.pyc
Merge branch 'master' of https://github.com/pymmrd/ireader
model