Pushed all the introduction changes. The vocabulary introduction is working now in the JonatanBranch but needs to be tested to see if it works on this branch.
Merge branch 'JonatanBranch' into IntroductionBranch

Conflicts:
	EMBRACE.xcodeproj/project.pbxproj
	EMBRACE_Client/Book.m
	EMBRACE_Client/EBookImporter.m
	EMBRACE_Client/InteractionModel.h
	EMBRACE_Client/PMViewController.m
	EMBRACE_Client/en.lproj/MainStoryboard_iPad.storyboard
	farm.epub

Fixed the conflicts shown in SourceTree. Will make the tests and changes to make sure the merge is succesful.
Ignored some local files on this repository.