Commit
Merge branch 'master' of https://github.com/Grapheme/distribooks

Conflicts:
	application/config/config.php