Merged both IntroductionBranch and JonatanBranch. It is working properly but the ePub files still need to be merged.