Only building artifacts
Merge branch 'master' of https://github.com/OlliD/emodel

Conflicts:

EmotionMain/target/classes/de/unibi/agai/emodel/emotionmain/Controller.c
lass

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$1.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$2.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$Layer1CheckboxListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$Layer2CheckboxListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$Layer3CheckboxListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$OnOffStragtegyActionListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$OnOffStrategySetActionListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$StartButtonListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$StopButtonListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$TimeStragtegyActionListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$TimeStrategySetActionListener.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller$strategy.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/Controller.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$1.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$10.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$11.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$12.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$13.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$14.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$15.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$2.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$3.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$4.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$5.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$6.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$7.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$8.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui$9.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/gui/StrategySelectorGui.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/robotconnector/HCGui.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/robotconnector/HeadPositions.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/xcf/MemoryConnector$1.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/xcf/MemoryConnector$2.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/xcf/MemoryConnector$3.class

EmotionStrategySelector/target/classes/de/unibi/agai/emodel/emotionstrat
egyselector/xcf/MemoryConnector.class