tutors cleanup and abstractor added.
Added notion of 3 lives for abstractor. ParameterProber does not seem to
be working now.
message update
multiple fixes
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ScienceEngine-designer/src/com/mazalearn/scienceengine/data/Messages.properties
	ScienceEngine-desktop/data/Electromagnetism/1.json
	ScienceEngine-desktop/data/Electromagnetism/2.json
	ScienceEngine-desktop/data/Electromagnetism/3.json
	ScienceEngine-desktop/data/Electromagnetism/4.json
	ScienceEngine-desktop/data/Electromagnetism/5.json
	ScienceEngine-desktop/data/Electromagnetism/6.json
	ScienceEngine-desktop/data/Electromagnetism/7.json
	ScienceEngine-desktop/data/Electromagnetism/8.json
	ScienceEngine-desktop/data/Electromagnetism/9.json
	ScienceEngine/src/com/mazalearn/scienceengine/app/services/loaders/TutorLoader.java
	ScienceEngine/src/com/mazalearn/scienceengine/core/view/AbstractScience2DView.java
	ScienceEngine/src/com/mazalearn/scienceengine/core/view/ControlPanel.java
	ScienceEngine/src/com/mazalearn/scienceengine/core/view/IScience2DView.java
	ScienceEngine/src/com/mazalearn/scienceengine/core/view/Science2DActor.java
	ScienceEngine/src/com/mazalearn/scienceengine/core/view/ViewControls.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/ElectroMagnetismView.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/model/Ammeter.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/model/Parameter.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/probe/AbstractFieldProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/probe/FieldDirectionProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/probe/FieldMagnitudeProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/probe/LightProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/domains/electromagnetism/probe/VariablesProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/AbstractScience2DProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/AbstractTutor.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/Guide.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/Guru.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/ITutor.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/ParameterProber.java
	ScienceEngine/src/com/mazalearn/scienceengine/guru/Subgoal.java
Merge commit '36021ecd2f0bc3c3a4a83c175f8fd272fea914c0'

Conflicts:
	ScienceEngine-designer/src/com/mazalearn/scienceengine/data/Messages.properties
	ScienceEngine-desktop/.classpath
	ScienceEngine/src/com/mazalearn/scienceengine/guru/Dashboard.java
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
forcing a proper merge.
project file of desktop was corrupted