Merge pull request #3 from benetech/develop

2014.04.R1
Merging for 4.6.1 sprint
Merge for 4.6.2 release.
Merge pull request #6 from benetech/develop

IMG-586 fix image checker for epub3s
Merge remote-tracking branch 'origin/develop' into develop