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.
Merged both IntroductionBranch and JonatanBranch. It is working properly but the ePub files still need to be merged.
Merge the changes to the PMStyle.css files on both pubs to improve the design of the text boxes.
Added a line to prevent the app from crashing when there are no solution steps.

Broke down the setupCurrentSentence function into setupCurrentSentence and setupCurrentSentenceColor to separate the visual formatting of the sentence.
Modified the introduction to play the audio files given the condition (ENGLISH/BILINGUAL). The translations are still hard coded but will be read from the metadata in the future.

Deleted some audio files that are no longer necessary.
Added more introduction updates, specifically for the correct movement detection based off of Audrey’s solution checking.
New changes to the general introduction. The vocabulary introduction needs to be redesigned.
Finished the steps for the ideal scenario of the introduction. The feedback messages are still to be included.
Added all of the audio files so far.
Changed the app name to English. Right now it is on the English only version, but it can be change to bilingual mode by changing the value of the language_condition variable to BILINGUAL.
Changed the sound files path from being relative to Group to Project.
Modified the project settings to be able to play the sound files.
Re-added Copy Bundle Resources for audio files
Updated the BFEE_20A.m4a file and the epub entry to play the correct version of the audio.
Added the latest introduction and vocabulary changes.
Disabled the timed audio for the training sessions.
Fixed the non-action word word not showing in Spanish bug.
Fixed the highlighting length for the objects in the story.