initial commit
Squashed commit of the following:

commit 47c4801bc14089a3d2c948104984f01c7ead640a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat May 17 17:45:54 2014 +0200

    updated to scala 2.11

commit 4ee7d0e8e81d804356075fccf538cb5f822b15c2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 12 11:28:12 2014 +0200

    updated for unifiedaccess

commit 563c997373e9eb27ac904d3c64934aad74cfa5eb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 11 20:21:39 2014 +0200

    adjustments for unifiedaccess

commit 58155567868d97d9a29e2218368b93d05ceac778
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 29 13:57:30 2014 +0200

    small fix

commit 1914718922aa3fadb29cac158c1ecfcaaa99ae46
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 29 09:13:14 2014 +0200

    Updated

commit 0a36e003ca5fac473a6a4acbab84f9f32f086294
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Apr 28 11:01:15 2014 +0200

    Updated ontology member generation

commit 6879fadea2475c7b09268194e67b521b0b0b05bf
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Feb 28 17:56:34 2014 +0100

    Repaing onto gen (wip)

commit 27e004e2ea7fe8294b1a11ae97c0ab7d5da2510c
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Feb 26 19:00:12 2014 +0100

    Repairing

commit a52d41a002587324238bdf16d2525b3dc03adab1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Dec 4 00:25:46 2013 +0100

    cleanup

commit 4b3c33647132167ffe51c8606819e96a4648fc6f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Nov 12 23:35:25 2013 +0100

    update to scala 2.10.3

commit 2721656b245e62327adeb2038fb7ab44d1ccaa57
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 28 13:45:13 2013 +0100

    updated to new format

commit 9bb75ccffe43f3271225a55ac0726aef515ebdc8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 21 16:28:34 2013 +0200

    update

commit 35832855e3e063005ffc352d2e6f379f011f3ff8
Merge: d7da73e 4695f55
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Sep 27 13:34:50 2013 +0200

    Merge branch 'scala-2.10-upgrade'

commit d7da73ef7e53c519a5cd062df6168f83a98624e3
Merge: 2865a5c 816605f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Sep 27 13:34:34 2013 +0200

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/ontology/generating

commit 4695f55379de09f09fdc87bebacb0f97b4e5f598
Merge: 25f3c59 816605f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 11:49:03 2013 +0200

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/ontology/generating into scala-2.10-upgrade

commit 25f3c59ff885830976a5d1ebc4627ba8d8b0117d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 10:39:38 2013 +0200

    cleanup

commit 2865a5ce5f881a32eaf00c30cc86f4df114c6b36
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 12 11:09:43 2013 +0200

    cleanup

commit a8fce679315ee3caae0a29f5ea13715c1620587f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 7 18:44:19 2013 +0200

    scala 2.10 again

commit 816605f61da53e5f6b7eb9181d8978eda1503f1b
Merge: a5a9bbb 5bf1c74
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 00:37:56 2013 +0200

    Merge branch 'master' of ssh://trinity/var/git/projects/siris-modules/components/ontology/generating

commit 5bf1c74d314397671ddbb8f252817edfc08dc2a8
Merge: b09244f 283f98a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 15:41:56 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/github-release'

    Conflicts:
    	src/simx/components/vrpn/TrackerDescription.scala
    	src/simx/components/vrpn/VRPN.scala
    	src/simx/components/vrpn/VRPNConnector.scala
    	src/simx/components/vrpn/VRPNListener.scala
    	src/simx/components/vrpn/devices/TrackingTarget.scala
    	src/simx/components/vrpn/devices/VRPNAspect.scala
    	src/simx/components/vrpn/devices/VRPNButton.scala
    	src/simx/components/vrpn/devices/WiiMote.scala

commit a5a9bbb98e71a8104531ad7520e4d4ce516922f6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 15:41:56 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/github-release'

    Conflicts:
    	src/simx/components/vrpn/TrackerDescription.scala
    	src/simx/components/vrpn/VRPN.scala
    	src/simx/components/vrpn/VRPNConnector.scala
    	src/simx/components/vrpn/VRPNListener.scala
    	src/simx/components/vrpn/devices/TrackingTarget.scala
    	src/simx/components/vrpn/devices/VRPNAspect.scala
    	src/simx/components/vrpn/devices/VRPNButton.scala
    	src/simx/components/vrpn/devices/WiiMote.scala

commit 283f98af1f40d793a2ca569a27ba352fd4df3710
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Mar 28 23:57:17 2013 +0100

    initial_commit

commit b09244fcb4612868923b62582900cc21975bad5e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Mar 20 18:07:29 2013 +0100

    repaired file path

commit 019b9fdfbe21f4d8119596fbbbf5c2dc44ab5b93
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 19 17:50:10 2013 +0100

    ...

commit 5c6aced66f088628297bac1c360af7f84778ec0d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Mar 18 19:23:47 2013 +0100

    adjusted creating for example component

commit 0b22feb7b7fb7ea0648df6666ca776220222babb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Mar 15 17:25:37 2013 +0100

    renamings

commit 19f644e1bd29a6fbd3ea80f6133b04d19735ab94
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:26:04 2013 +0100

    using project sdk

commit 2ec96aeddc05dce5ba4e99fa5b752473a5e6aaf1
Merge: 2b1018d 8e15730
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:01:51 2013 +0100

    Merge branch 'akka-migration-dennis'

commit 8e1573089815a0c80bd273daa850705bd882f345
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Mar 11 14:07:12 2013 +0100

    generating more info

commit 2b1018d31647538101b8b3a51dadb7e77100a60b
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Mar 7 09:37:58 2013 +0100

    - Fixed library

commit dfdb8b30392592961ed67773e9f087f84918e299
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Feb 25 11:45:30 2013 +0100

    - changes

commit b18125b27e720dd4b0a49672d9b69da7cbfa9304
Merge: 42cc887 25cc737
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:33:55 2013 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/ontology/generating

commit 42cc887dc54ce55991a83a3f84564fae05c32259
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:27:22 2013 +0100

    - changes

commit 25cc73702af3c2b3b9c573faf8d107a9e4ca0263
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 17:05:49 2013 +0100

    Removed scala version dependency in sbt output path and in .iml files

commit b438aeb455e3f31c5e08a07c18fc647f4057cfd7
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 16:00:39 2013 +0100

    Removed hard wired scalaVersion from sbt files.
    The sbt version is now configurable in the main Build.scala and referenced in the local .sbt files.

commit e5740e2d7e930e3189f63bc158db990aff775c27
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 11:43:58 2013 +0100

    ...

commit 80b78e39b003bcbba05676d0170bd5d63c413bb1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 13 17:53:17 2013 +0100

    fix

commit 7033c5492a64eb8c8f6328e4f9442a8c14d3d74f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 12 19:41:41 2013 +0100

    added test ontology file

commit e0f542559c63645d8166d50789d9f58acff168a2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 12 19:39:25 2013 +0100

    ...

commit 0b9f69073879b1181eaeac6293cca3b041686865
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 12 18:50:21 2013 +0100

    started repairing ontology gen

commit be18d2f06ed69f8ec18c3143f0730630d041117e
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 19 09:55:03 2012 +0200

    - Renamend siris to simx

commit 5027fdce7d47611238169779912a21cd77561179
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 18 14:35:07 2012 +0200

    - Module dependency

commit 39daf78965222a369b8973a05454f52bf08becc9
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 11:48:15 2012 +0200

    - Restructured libraries

commit 074bde624e1cb90cd70217140444d0892970779d
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Sep 22 15:09:47 2012 +0200

    libraries

commit 74a677dc84bfc1d1a3a0c5017076e791f86b4b78
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 13:18:26 2012 +0200

    commit before re-implementation of ghost behavior

commit 0d1f48cafe08164c58b9bf5ab1bf41fb0aab7af6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:43:30 2012 +0100

    ...

commit 07449870476b0d56d2c861b0a92636fdcbd1af15
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 14 10:07:27 2012 +0100

    made ontology module compile

commit f8c7ea091eeb6838c37528f6c83767a598706cde
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 24 09:23:46 2011 +0100

    did sth

commit 826bba6389847be6c883c98d03aab0e0c0879a71
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Nov 22 16:16:37 2011 +0100

    cleanup

commit 94ddf66f48bea00e30b69119293a2f75b3b76721
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Nov 21 17:00:50 2011 +0100

    initial commit
updated to current production version
Merge remote-tracking branch 'origin/master' into github-release

Conflicts:
	build.sbt
	ivy.xml
	ontology-generator.iml
	src/simx/components/ontology/generation/OntoGenTwo.scala
	src/simx/components/ontology/generation/OntologyMember.scala