first commit after the randomDeleting file issue
no message
Merge branch 'master' of https://github.com/xperiment-Mobi/classes

Conflicts:
	com/Start/AbstractStart.as
	com/Start/MobilePlayerStart/AbstractMobileStart.as
	com/Start/MobilePlayerStart/MobilePlayerStart.as
	com/Start/MobilePlayerStart/utils/ParseMobileScript.as
	com/Start/MobilePlayerStart/view/PlayerView.as
	com/danielfreeman/madcomponents/UIScrollVertical.as
	com/greensock/loading/DataLoader.as
	com/hurlant/math/BarrettReduction.as
	com/hurlant/util/Base64.as
	com/xperiment/Animation/MessageAnimation.as
	com/xperiment/ExptWideSpecs/ExptWideSpecs.as
	com/xperiment/ExptWideSpecs/ExptWideSpecs_MobileParams.as
	com/xperiment/Results/Results.as
	com/xperiment/behaviour/behavBlur.as
	com/xperiment/behaviour/behavFullScreen.as
	com/xperiment/behaviour/behav_baseClass.as
	com/xperiment/make/comms/Communicator.as
	com/xperiment/make/xpt_interface/Bind/BindScript.as
	com/xperiment/make/xpt_interface/Bind/Bind_addTrial.as
	com/xperiment/make/xpt_interface/Bind/MultiTrialCorrection.as
	com/xperiment/make/xpt_interface/Cards/Cards.as
	com/xperiment/make/xpt_interface/MessageMaker.as
	com/xperiment/make/xpt_interface/PropertyInspector.as
	com/xperiment/make/xpt_interface/StartMaker.as
	com/xperiment/make/xpt_interface/StimParams.as
	com/xperiment/make/xpt_interface/TrialBuilder.as
	com/xperiment/make/xpt_interface/TrialHelpers.as
	com/xperiment/make/xpt_interface/UpdateHelper.as
	com/xperiment/make/xpt_interface/runnerBuilder.as
	com/xperiment/make/xpt_interface/trialDecorators/CommandHelper.as
	com/xperiment/make/xpt_interface/trialDecorators/StimBehav/StimBehav.as
	com/xperiment/make/xpt_interface/trialDecorators/TrialDecorator.as
	com/xperiment/make/xpt_interface/trialDecorators/sizeHelpers/Sizer.as
	com/xperiment/make/xpt_interface/trialDecorators/sizeHelpers/SizerJPG.as
	com/xperiment/onScreenBoss/OnScreenBoss.as
	com/xperiment/onScreenBoss/TrueTimer.as
	com/xperiment/preloader/PreloadStimuli.as
	com/xperiment/runner/runner.as
	com/xperiment/runner/runner_devices.as
	com/xperiment/stimuli/StimulusFactory.as
	com/xperiment/stimuli/addButton.as
	com/xperiment/stimuli/addJPG.as
	com/xperiment/stimuli/addText.as
	com/xperiment/stimuli/addVibrate.as
	com/xperiment/stimuli/behavTimer.as
	com/xperiment/stimuli/helpers/ShuffleSuperUnique.as
	com/xperiment/stimuli/object_baseClass.as
	com/xperiment/stimuli/primitives/BasicText.as
	com/xperiment/trial/Trial.as
	com/xperiment/trial/TrialANDROID.as
	com/xperiment/trial/Trial_devices.as