Over writing logging branch to match master branch

1. Added logging for audio files in introduction includes filename and
language
2. Added logging for emergency swipes
3. Moved logging functions into deepest level in pmviewcontroller to
reduce logging redundancy and capture all user and computer actions
associated with object manipulation
4. Logging added for word presses
5. finalized naming conventions primarily for selection and action
logging fields
6. added more information for logging moving objects to objects or
locations
7. verification expanded to match appropriate computer action
Changed login screen

1. added a school code input field, changed study code input field to
participant code input field, study condition will have to be hard
coded for each study, changed in servercommunicationcontroller.m
function logContext, there is a comment for the node that needs to be
changed
Merge branch 'LoggingBranch' of https://github.com/hcilabasu/EMBRACE-iPad into IntroductionBranch

Conflicts:
	EMBRACE.xcodeproj/project.pbxproj
	EMBRACE_Client/CES_14.m4a
	EMBRACE_Client/EBookImporter.m
	EMBRACE_Client/Introduction.h
	EMBRACE_Client/Introduction.m
	EMBRACE_Client/IntroductionStep.h
	EMBRACE_Client/IntroductionStep.m
	EMBRACE_Client/IntroductionViewController.h
	EMBRACE_Client/IntroductionViewController.m
	EMBRACE_Client/PMViewController.m
	EMBRACE_Client/VocabularyStep.h
	EMBRACE_Client/VocabularyStep.m
	EMBRACE_Client/en.lproj/MainStoryboard_iPad.storyboard
	bestFarm.epub
	circulatory.epub