commit #1
Squashed commit of the following:

commit 7f2171f745d2e5af44b891e15cc79086c19d6daf
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 19 12:21:38 2014 +0200

    Squashed commit of the following:

    commit a7a5c5f621213e45812572419d906e3e07cbfbe3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 17 17:48:26 2014 +0200

        updated to scala 2.11

    commit 894f4b9b526b1b640613cb417d3ddc03976231b6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 17 15:24:19 2014 +0200

        updated dependencies

    commit c8ba286e2879971eb9904c470ef1832f93b5e088
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 17 10:47:05 2014 +0200

        upgrade to scala 2.11

    commit 06f3ca9725f045395277ebc9261a2b2f67bf2e81
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri May 16 14:53:40 2014 +0200

        Clean up

    commit 9950c15496059a7ed170722c041f7e021734ddb1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri May 16 11:01:54 2014 +0200

        Clean up gui component

    commit 4cc136d04cb357131f0b69529ea3a29952bc9b00
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 13 20:30:32 2014 +0200

        fixed bug ocurring during filtering of svars

    commit 55a008bb4084c21e376ef1dac42586805c0e74b8
    Merge: 72889bc 895716d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 13 19:21:01 2014 +0200

        Merge branch 'hci/master'

    commit 895716d35bc6f049788c53981fbbfe18c5806f54
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 13 19:03:16 2014 +0200

        fixed updated bug when adding new state variables (did forget remove observers)

    commit 317e8892fb6cc75af68ee132b01712bfe07c87ff
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 13 15:22:49 2014 +0200

        fixed removal bug

    commit 72889bc39d241da988d45b104d66e53e186f65a7
    Merge: 957ba75 2560b17
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 12 17:27:57 2014 +0200

        Merge branch 'hci/master'

        Conflicts:
        	src/simx/core/entity/Entity.scala
        	src/simx/core/entity/component/EntityCreationHandling.scala
        	src/simx/core/ontology/EntityDescription.scala
        	src/simx/core/worldinterface/eventhandling/EventDescription.scala
        	src/simx/core/worldinterface/eventhandling/EventHandler.scala (reverted from commit 1ae734b7c0b0c88f3d40e7e5b87a49c29d3a78ef)

    commit 2560b17e3c9764f22c0460ceb95c4e15c52fc4cd
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 12 11:36:39 2014 +0200

        irgnored target folder (again)

    commit 0b093ffa483f21aadba800b0c8ff1d6fa78109f1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 12 11:26:51 2014 +0200

        updated ontology content

    commit b6f131fbd2e13e185337297a80acdca64a842558
    Merge: cfc92d0 58df608
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun May 11 20:20:48 2014 +0200

        Merge branch 'origin/master'

        Conflicts:
        	src/simx/core/ontology/entities/Entities.scala
        	src/simx/core/ontology/types/package.scala
        	src/simx/core/svaractor/unifiedaccess/EntityAccess.scala
        	src/simx/core/svaractor/unifiedaccess/Relation.scala
        	src/simx/core/svaractor/unifiedaccess/Unknown.scala
        	src/simx/core/worldinterface/WorldInterfaceHandling.scala
        	src/simx/core/worldinterface/WorldInterfaceMessages.scala

    commit cfc92d07cc941edc9b32c8180692831d0f50b635
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun May 11 17:42:21 2014 +0200

        more bugfixing regarding events and multiobserve. added some features

    commit 7bba3f2da84c98b42de2ffa4a83ff25465703f32
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 23:52:37 2014 +0200

        fixed bug in event handling

    commit 459e17c6e905e321066dcd385e5ce6714c1889e8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 23:05:44 2014 +0200

        fixed bug in atomic set (could have waited for unobserved svars)

    commit 53043f03bcadc08c81ac798e77f642261a9a77e0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 14:46:52 2014 +0200

        cleanup

    commit 22b9dd45b4aecaef0df896c82197dccf4a5d6612
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 14:43:26 2014 +0200

        presumably working

    commit 888d617e28efb0715c33aa2e216a551cffa8478b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 12:28:38 2014 +0200

        commit in between

    commit 87f77961d38f79d6a8be096bcce7e4faa0593981
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat May 10 10:14:32 2014 +0200

        cleanup before further implementation

    commit c589d50b426d943ee27aa183a329d9d74f0aca65
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 9 22:32:56 2014 +0200

        worked on atomic set and multiobserve (wip)

    commit 8f24b120a6296c1ead8b6ad1a2c8a17065bfa6f4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 9 19:57:50 2014 +0200

        preparations for atomic set support

    commit 7d9c077e779f9ac198eb2566aa05915ac0586daf
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 9 14:10:07 2014 +0200

        started support for enabling/disabling aspects

    commit b0b78168a8ec66c672b478cfd8b49ed5e719b258
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 9 13:02:48 2014 +0200

        added support for ignored writers

    commit 7d01428b0afc1c0b224360dae338eb054d30faed
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 8 22:36:39 2014 +0200

        fixed bug that prohibited reuse of entitydescriptions, changed internal naming a little

    commit 957ba75173e5ac751bc72cdad2e026d9c4b54d8c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 7 23:22:31 2014 +0200

        small changed to naming

    commit 6977b4071ccb13b94e849394abd9b0b958a80df3
    Merge: c822c1a 0af1778
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 7 18:23:24 2014 +0200

        Merge branch 'master' of win9148.informatik.uni-wuerzburg.de:hci/simx-core

    commit c822c1a8429f74afba9b7f01b3fc4fe5099e83f7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 7 18:23:14 2014 +0200

        updated eventhandling

    commit 02679553a139597ce7624e5a465ac540aba8f906
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 7 18:17:43 2014 +0200

        updated eventhandling and added simpler access

    commit 055d8d6149c9efdbb6dec6f17406b37900024e0a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 7 11:09:23 2014 +0200

        small update

    commit 58df60852891ed92f615bb1e1e1610b165996aa4
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon May 5 16:10:30 2014 +0200

        Fixed bug

    commit fc00e43dabdb395d651f52ea00cfec9af3942feb
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 2 20:35:44 2014 +0200

        added option for handling empty accessset

    commit a9e8f4fe4b17d68f2e08b46bd2bc043741cbaed6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 2 13:59:06 2014 +0200

        cleanup and support for late removal requests

    commit 88d4bd1ae454b1c0e18fc807df87ae378b8eb837
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 30 18:15:34 2014 +0200

        cleanup

    commit 9509459302450599046c50f68ecccdbb15e95d0f
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 29 17:12:39 2014 +0200

        Updated gui to auto gen onto packages (wip)

    commit 46a6d770e4f8ccc72beaa062d97cf076a8063fc7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 29 16:30:04 2014 +0200

        fixed access bug

    commit ff4caaf023d762fe8b61d3f4fadc17d7ed2764d9
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 29 15:29:02 2014 +0200

        Updated autogen onto package (jbullte)

    commit 457ed7e7640fee35c8fc1fac84b3550e74f53737
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 29 13:57:15 2014 +0200

        Updated to generated ontology package

    commit 8ddd1154044f62cf2ec787e0ab93a791adcbc894
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 29 09:14:52 2014 +0200

        Fotgot to adapt the manually created svardescs

    commit edb3b8348ec81f1bc55c3a8435a24833298d2ff1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 29 09:12:56 2014 +0200

        Fixed relation's type params

    commit 0af1778e5463a09cb59f77458ec134304d9a5638
    Author: Chris Zimmerer <chris.zimmerer@stud-mail.uni-wuerzburg.de>
    Date:   Mon Apr 28 17:00:40 2014 +0200

        Fixed remoting errors

    commit b663fe021ace0fb4823ee8c93e6d88749fbbd11b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Apr 28 15:23:26 2014 +0200

        removed typeparams from relation

    commit d456a4847c51607a272f97519b45189279d0f3e7
    Merge: 8bf59f7 39bfe23
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Apr 28 10:04:53 2014 +0200

        Merge branch 'unifiedaccess' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core into unifiedaccess

        Conflicts:
        	src/simx/core/entity/Entity.scala
        	src/simx/core/svaractor/unifiedaccess/AccessSet.scala
        	src/simx/core/svaractor/unifiedaccess/EntityRelationAccess.scala
        	src/simx/core/svaractor/unifiedaccess/Relation.scala

    commit 39bfe231c217f428f0d082102acd48b8ceb8fc43
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Apr 27 23:56:02 2014 +0200

        more consistent implementation

    commit 8bf59f71719d0b888aaf270712ddc578a7a49d0a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 22:47:12 2014 +0200

        ...

    commit 9906c140e2ae0c5e37f47609401815efdbf391b9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 21:39:40 2014 +0200

        cleanup

    commit 5dd2d302572732cf3a16fb21d75db19f65576280
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 21:23:53 2014 +0200

        cleanup

    commit 5ac5cf5b9231df79d10e19c1c59505410ca4a08e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 21:03:57 2014 +0200

        updated relation handling

    commit 60e1558c78a01021f1d0106ceac70f585669baff
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 17:18:03 2014 +0200

        fixed class tag issue with set

    commit 4622b011675e8e2f6bace56f912a93998cba496a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 17:15:39 2014 +0200

        observe will be called when new svars are added, too

    commit 16c352d93eb256d31feac5383d85c7be4595dccc
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 16:40:30 2014 +0200

        commit in between

    commit 885cc51b0b11240d4b0bad66ea1f44c9fb0cf1bc
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 25 10:04:51 2014 +0200

        updated structure

    commit 03103e6d904d624fcd4699ccdd569a20e1971dd1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 24 17:49:56 2014 +0200

        updated structure

    commit c5e6a91a1732082cbccdc1e4e086a85c56f32217
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 24 14:54:53 2014 +0200

        updated structure

    commit 47ef23f8eb3a02104cbaaefad3869631fcf88b9b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 24 14:43:24 2014 +0200

        updated structure

    commit 2b56cf4f8589d66da32753320746576d19da58f2
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 23 19:23:56 2014 +0200

        more concise to string output of entities

    commit 2f708e7557666181ed28d948d919c79a7c3878f5
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 23 19:17:01 2014 +0200

        fixed svarupdatefunctionmap issue

    commit 49cebd908354a048eed49db74a40b87752602047
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 23 18:29:14 2014 +0200

        update

    commit d0e07123cdbc10bfcdf00d8a64502c4a7b7a400b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 23 14:09:06 2014 +0200

        update for unifiedaccess (bugfixing)

    commit c45df066607d03386937970582e92d566dce43b4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 22 12:11:06 2014 +0200

        updates for integration

    commit f42dbb6c847f3e523a68286ce57634dbeb8f8365
    Merge: 817bf2d 2769656
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 17 18:53:08 2014 +0200

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core into unifiedaccess

        Conflicts:
        	src/simx/core/SimXApplication.scala

    commit 817bf2de1f2f8cde1766336a3f6b0d6b46c5a5f4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 17 18:51:14 2014 +0200

        started unified access branch

    commit 63ea39316add6b3fe2c4a2d8926aaea065758bdb
    Merge: ecdf441 2769656
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 15 15:15:16 2014 +0200

        Merge branch 'hci.uni-wuerzburg.de/master'

    commit 276965685e09d9366bb0d99b544b414cc240711c
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Apr 15 15:12:42 2014 +0200

        Streamlined SimXApplication and adepted applications

    commit a53ce304d3706b44f4c390de2b422254c5c2bec4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Apr 11 18:36:55 2014 +0200

        more on entity relations

    commit 5242974f50ccdb1092e4d5a2ada2af15a70fe716
    Merge: c8003ea eddfdc1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 10 13:51:10 2014 +0200

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit c8003eaec9b00fc0e147f28a2b883a3954b01789
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 10 13:51:03 2014 +0200

        added test

    commit ecdf44124567c0c2fb8421a885e3cb32772338c6
    Merge: 1fc5ab0 eddfdc1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Apr 9 11:30:42 2014 +0200

        Merge branch 'hci.uni-wuerzburg.de/master'

    commit eddfdc10f27c32cb0ba51c97e3cf5972e54b9c0f
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Apr 3 22:19:01 2014 +0200

        Cleaned up examples
        Migrated general methods and defs to core

    commit 4b0d466edf768922cdb59a33b0c33bc288dab91c
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Apr 2 17:15:42 2014 +0200

        Fixed event-system

    commit 1fc5ab0c36b84edcc4a310ceb518d8ec10e82ad8
    Merge: f5aa0fc bd3e13a
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Mar 28 14:48:36 2014 +0100

        Merge branch 'hci.uni-wuerzburg.de/master'

    commit bd3e13aeeb38ca257b421bb2a0f4ac45a0441add
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Mar 28 14:43:57 2014 +0100

        Fixed bug

    commit 39267e8b8bdc157cccc05d135d3891aefec3fc14
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Mar 19 19:23:16 2014 +0100

        updated acessset

    commit a1cbaba82f7c4bdbe28d4fa350b336baf2b0adb9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Mar 14 17:37:29 2014 +0100

        started relations

    commit 6e013cbe28504995d3f786efc0aa03aea1fa5683
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Mar 13 20:13:33 2014 +0100

        more on new access model

    commit 3658220278cc1d56827acc35c444dafed4a1065a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Mar 13 18:48:05 2014 +0100

        more on new access model

    commit 361dc68b9e1888a15824f1a84b5b2b554c2465f8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Mar 12 19:00:43 2014 +0100

        more on new access model

    commit 4d535de58b79ace88d78f1873db1c22c1adc5bd1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Mar 12 18:19:44 2014 +0100

        more on new access model

    commit 4d94f2d8120176931817883af5cc4f2e5e699bc9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 10 19:14:52 2014 +0100

        more on relations

    commit d284f66188eb346cb7ee602f054fcd4efe3b6a79
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 10 17:15:01 2014 +0100

        more on relations

    commit 927d206b04a6e4b16f6c01744bd189e59953d741
    Merge: ab29c9b 0581ced
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Mar 7 16:37:07 2014 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit ab29c9bb29ebbba204cc01a6900fa346c4c9189f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Mar 7 16:37:02 2014 +0100

        updated relations

    commit 0581cedd8b819d75192a1479aa6dc82a281910aa
    Merge: ee12faf ca533e1
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Mar 7 10:55:05 2014 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit ee12faf0a2c32ceb1eaf8179309fd2957abcd9d9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Mar 7 10:52:54 2014 +0100

        Profiling with information for spawn tree

    commit ca533e1169a2f26e0d1edb714eadc466bfb695ac
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Mar 6 22:04:03 2014 +0100

        started implementation of relations

    commit d568ae471b9e7ecf7a983c368f3d113212e5f521
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Mar 6 22:03:46 2014 +0100

        started implementation of relations

    commit 2cc9385ba638f8d38de926988e4c25089af49b95
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Mar 6 21:49:58 2014 +0100

        Instrumentation with nano time precission

    commit 1baa5219f7f68e9f02b81e1b0ebfbd4dc2b66a56
    Merge: 7936d62 f5aa0fc
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Feb 5 12:40:04 2014 +0100

        Merge branch 'win9148.informatik.uni-wuerzburg.de/master'

        Conflicts:
        	src/simx/core/svaractor/SVarActor.scala

    commit f5aa0fc49ea68fcf7e87f1dba8c92688261c43d6
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Feb 5 12:31:58 2014 +0100

        Reduces akka's dead-letters info logging to 1

    commit 7936d6211cfb691e012eb6d6becf42278e9b3426
    Merge: 2e0c2d1 1d707f9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Jan 31 18:58:49 2014 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit 2e0c2d15db74e7a32385d33cc1ffaf89a954aa74
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Jan 31 18:58:43 2014 +0100

        updated event system

    commit 1d707f9cb80e4ac457eb385abbb44815b7ccd61f
    Merge: 3af1d92 4def443
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Jan 31 16:50:50 2014 +0100

        Merge branch 'win9148.informatik.uni-wuerzburg.de/master'

    commit 4def4435978131bf8b1823ced7e7c574844a7030
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Jan 31 16:49:19 2014 +0100

        New type for editor cfg

    commit 3af1d92a43fd855d4b42a245a85bb7d8fbdc84f2
    Merge: b13c4ca dd599bd
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Jan 30 22:38:55 2014 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit b13c4ca04c229b97130166b19504b5b1e2ebaae2
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Jan 30 22:38:23 2014 +0100

        New profiling lib

    commit dd599bd0825ce75411c12e01f9f8503050bcf92d
    Merge: c6dc5a3 a60cd32
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Jan 30 18:31:40 2014 +0100

        Merge branch 'win9148.informatik.uni-wuerzburg.de/master'

    commit c6dc5a337f6fc918465f4a0279d88e2ef9d77819
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Jan 30 13:12:11 2014 +0100

        Improved profiling lib

    commit 186151fa0c8c7d6defd4fd112f10873611e1fcf0
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Jan 27 23:56:10 2014 +0100

        New profiling system

    commit a60cd32b9bd3a19048e20c121a94da67d61a3391
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Jan 27 17:46:08 2014 +0100

        Updated for machine-learning course

    commit 53cb2be2beae6523dcee23be3776f93a8b741056
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Jan 27 13:22:10 2014 +0100

        Removed old benchmark subsystem

    commit 0ae17e86492b1f8542daa07f333148a83efd20a8
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Jan 21 15:53:12 2014 +0100

        Added cv component example
        Fixed typos

    commit 1f8669d5396be3fffd0f1e6c1512397b45f30fef
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Jan 20 13:46:20 2014 +0100

        Updated to jogl 2.1.3

    commit 9c37831326d5fa56227f98c2e86c09f3f72ee6b2
    Merge: 17632da 3adc172
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Sun Jan 19 14:16:17 2014 +0100

        Merge branch 'origin/master'

    commit 17632da53a16d43cb0774bb3720b95b36611b1b7
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Sun Jan 19 14:15:55 2014 +0100

        added symbols for j4k component

    commit 3adc1721755314adefe3ecafcfecf7b9e7609932
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Jan 16 11:51:04 2014 +0100

        added comments

    commit 18efcb5f87ce61d20ea5477e5af6f49b86a10922
    Merge: 7828ca2 508d78e
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Wed Jan 15 19:31:03 2014 +0100

        Merge branch 'origin/master'

    commit 7828ca20d22fd662cf53e7e73f36a40626a13c7f
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Wed Jan 15 19:30:30 2014 +0100

        added symbols for raw mesh data and j4k component

    commit 508d78e9266df5a640dce30f99d2054c64ebbe54
    Merge: 72e4b93 5dfa392
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Jan 15 12:08:15 2014 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

        Conflicts:
        	src/simx/core/ontology/Symbols.scala

    commit 72e4b933e0033266e1411677f0b11bb36ce131a7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Jan 15 12:07:36 2014 +0100

        cleanuo

    commit 5dfa3920d2be5c9c73a3263926bff438a202f137
    Merge: 9f83f6e 7265753
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Tue Jan 14 16:17:51 2014 +0100

        Merge branch 'origin/master'

    commit 9f83f6e58dddd75f366cb593add829366f898f64
    Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
    Date:   Tue Jan 14 16:16:48 2014 +0100

        Added Mesh support

    commit a7837d2f8402cbe20db2cf486f125fd455f2d685
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Dec 29 16:47:28 2013 +0000

        small changes for ai (beautifications)

    commit 3189b53dd1e08161cfff6cfe4f64aa6d36251689
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Dec 29 14:03:53 2013 +0100

        updated typeinfo to use grounded symbols only

    commit 72657534216ceb12987038501effadd05824fff5
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Dec 16 19:38:00 2013 +0100

        updated shutdown method

    commit f818d2032c5b3512c91ef9105eb3072abbd925e0
    Merge: 45ff551 671fa3f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Dec 13 22:59:52 2013 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit 45ff551018eb86fdac3b3c64ae62c3ed35eb4601
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Dec 13 22:59:30 2013 +0100

        ...

    commit 671fa3f183a997db0e6e2b8c9bda55fbc3068c2e
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Dec 13 18:24:16 2013 +0100

        Renamed SVarBase
        Wip (evet support for editor)

    commit 44723ec9dd2455d862361b2ae8f05e06fd71649d
    Merge: 6b5ab9c 3eae69e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Dec 13 18:00:43 2013 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit 6b5ab9cc950a04ef2f822692ea600a51feae751a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Dec 13 18:00:38 2013 +0100

        updated keys

    commit 3eae69e271141d8e3718b74c1cca3684d08b832b
    Merge: d8d2092 66c0b92
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Dec 13 15:54:49 2013 +0100

        Merge branch 'origin/master'

    commit d8d2092b44bbecd3e129d034f35e26ad229368e8
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Dec 13 15:53:00 2013 +0100

        Added event reg

    commit 66c0b926c31f5b2643807f07552c197e57ed23d8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Dec 13 15:35:25 2013 +0100

        update

    commit 86c6f85dba916bf9c62386a98c013f09151179ac
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Dec 12 23:09:40 2013 +0100

        reworked svar typesystem

    commit 78e04d0528a842f02c18d8bda458f146ce023750
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Dec 12 22:38:07 2013 +0100

        commit in between

    commit 65bc3a2a41770bff189e658e4ec8345cf8be85b4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Dec 12 21:51:22 2013 +0100

        commit in between

    commit 4e7d2047bd966f55fe5012c42bc6c84021175bb6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Dec 12 19:52:14 2013 +0100

        commit in between

    commit 28a504b7ab6ff7f68cf1ce74ae847a670c60f9d8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 10 14:33:56 2013 +0100

        fixed sval-get bug

    commit ca4ee6913ed6e86db6b1f971c41578e9cc5485b9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Dec 9 20:07:26 2013 +0100

        update

    commit b8597d6f1891366be8b096547c784bb435343e27
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Dec 4 00:24:49 2013 +0100

        finished sval is an svar change

    commit 5a29cdf9a72c87cf6fb3f9cf6006796c31bca04f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 3 22:15:06 2013 +0100

        continued sval is an svar change

    commit c2bee5abb86b79dd0dc9bf52e02dd241b6bba78f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 3 20:13:26 2013 +0100

        prepared sval is an svar change

    commit 42a207a05d38e82a7619f6bbd861037f1250ec94
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 3 19:22:08 2013 +0100

        commit in between

    commit 66db6f251e889f462af430c737ef9d5135b23b6e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 29 20:03:49 2013 +0100

        added component config layer

    commit d56bdc893b0386364b4b203c8bb6b41c64cb1cdf
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 29 14:40:53 2013 +0100

        bugfixing

    commit a0dcf1f1e9439608b2c2880b6ca2e879f3f18483
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 29 10:42:15 2013 +0100

        update

    commit f5695fb5b75111210a5af990d7b45aa98c866367
    Merge: 4a72214 d26d076
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 28 22:04:01 2013 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

    commit 4a72214298d04a54780471ffaa302332a54502b5
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 28 22:03:58 2013 +0100

        integrated naming and cleanup

    commit d26d076365a7ae85fe29692848e08d12022c2df3
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 28 19:26:56 2013 +0100

        -> swing 2.10.3

    commit dcece14cfc2a80b7aabad2506c0dccc8f0c23676
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 28 19:03:42 2013 +0100

        more unification

    commit 2eaf3517c3780a71fae14adb3502c71665899cf2
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 28 17:26:17 2013 +0100

        more on component creation

    commit 138eed034888717dafb0109ce0e5d32a1374205d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Nov 26 22:23:55 2013 +0100

        integrated creation of subelements into entity creation layer

    commit 182f1f57099f1cf376a320f59ea62b9c696827c8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 25 17:37:57 2013 +0100

        ...

    commit 4eaf4f12c150459cd690fe070bc9691bd34540e3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 25 17:31:04 2013 +0100

        fixed message loss on late registration

    commit c7b138010e788b7e5d9b6a24c82038bc2167e6a7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 25 16:57:20 2013 +0100

        adjusted component creation for remoting

    commit 2e5be08322e4bc7b8c5432abd5d95e1271445946
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 22 15:45:11 2013 +0100

        more on entities

    commit d38551ab15003f9c8c092c7f9b965b43c2404ea0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 21 20:11:17 2013 +0100

        more on component entities

    commit 8d0d4d8c3a13c866204867c7944e91d8c2899a46
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 21 11:56:42 2013 +0100

        prepared component entity support

    commit 13f7c53be698ee3b9e94c161aba18218785d4959
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 20 19:20:45 2013 +0100

        cleanup in component section

    commit edce1a3d0571bfad074a252eb27e17f5d47cc042
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 18 15:51:34 2013 +0100

        bugfixing in entitycreationhandling (checked for owner overrides the wrong way)

    commit 4d1b1b97f17382916b7d261227e244a23e81b315
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 18 10:52:36 2013 +0100

        test

    commit a3caee1e827a2311513631bc768c963be3e611e2
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Nov 17 14:26:10 2013 +0100

        finished work on deadwatches

    commit 60d389b3716edd1231b16bca6c72e637717436a0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Nov 17 01:31:47 2013 +0100

        added some kind of deadwatch support

    commit 42061989dab24ee39a2acb8ad64933b42e45e644
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 22:46:57 2013 +0100

        ...

    commit b10fd5234bdfe9d7edb44d3cff9030dd63a7eec1
    Merge: 95022a0 23ed53c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 22:45:52 2013 +0100

        Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/core

        Conflicts:
        	src/simx/core/worldinterface/WorldInterfaceMessages.scala

    commit 95022a04ddb47f370253391e3566e5e57bbde7bd
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 22:39:52 2013 +0100

        ...

    commit 23ed53c48c5678679160e98b6e9473df111d3294
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 22:39:52 2013 +0100

        ...

    commit 8271c56793d3b747f6fcf6214b68ea9103d125e9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 21:39:02 2013 +0100

        more work on worldinterface

    commit 2cbcac8ad1f7a10817bbf69ee36efbc974188af7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 16 18:03:40 2013 +0100

        makeing event system more transparent

    commit d9db1840e737362b864162ef4191e8bcb93f0cb8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 15 19:29:36 2013 +0100

        more cleanup

    commit 66a760598b15de8d215d593f0e8f8fa6c530d7ee
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 15 09:40:05 2013 +0100

        added convenience method

    commit d7110606931c0857fb89877c80d4bb9b7fe85d27
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 14 23:00:30 2013 +0100

        some code review

    commit 1d5e37bf99eb4d3421a648dce1402a68fb3579b2
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 13 18:41:05 2013 +0100

        added jmdns support

    commit e41087d1bb0b2b7fa6b2b3804246de922d735e78
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 11 18:21:26 2013 +0100

        adjusted some entity descriptions

    commit 3923a6356863945decaf9e550f4b61766142280d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 28 14:19:33 2013 +0100

        udpated ontology

    commit 4eb3858a44e5fbff5ecc7485313f21c55553fb65
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 28 13:43:56 2013 +0100

        added entity-ontology connection

    commit 31e6acbe9915cf372d86c4281456e838e8235ed1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Oct 25 13:38:21 2013 +0200

        added convenience method

    commit 519695b06cb58ea338a19d2e0aea933e692928a8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Oct 25 11:30:49 2013 +0200

        some modifications for new converter types

    commit 539061bcbd87784a7758ca76707385e5f75b282c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 21 18:32:28 2013 +0200

        fixed reverter lookup bug

    commit 3b239f70a539546b28276b7e61217a23068c4f1d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 21 15:26:49 2013 +0200

        update

    commit 6eb70cf90aa4ae2e427ace860d18163409ab3e4e
    Merge: 4fe5195 84c1ed4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Oct 18 11:48:51 2013 +0200

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

    commit 4fe51958cf68e992e60d740be873023f432a4c6c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Oct 18 11:48:41 2013 +0200

        added continuations-get

    commit 84c1ed4e611abb6c88f8d8d75439932c4e11128c
    Merge: e6d9271 8e9f343
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 14 15:12:49 2013 +0200

        Merge branch 'github-release'

        Conflicts:
        	src/simx/core/components/io/SpeechEvents.scala
        	src/simx/core/helper/TextureData.scala
        	src/simx/core/ontology/types/package.scala

    commit 8e9f34337263c7b893f1121ac91240a750cd40c3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 14 15:07:12 2013 +0200

        update

    commit 1cabe6c0d526dcae7b761ecc816410ce2e27ec01
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 14 11:41:45 2013 +0200

        removed duplicated symbol

    commit 47fe81c54bbcab2827935e521b2f8210a0809f13
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 14 09:50:19 2013 +0200

        update

    commit e6d9271e2f331428161639279a61411494d5cc21
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Oct 14 09:40:07 2013 +0200

        updated actor settings for windows support (tickcoinunt = 10 for windows)

    commit abe328f0f700968eabc037d0ff2e265db395959d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Oct 2 11:02:00 2013 +0200

        Updated to scala 2.10

    commit 70aa52c3ceaa1b5d4a090729833b00613ea4c6cd
    Merge: ee28b87 f6ef4f1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Sep 27 13:29:01 2013 +0200

        Merge branch 'scala-2.10-upgrade'

    commit ee28b879cf75565c313715b96d35a72374727433
    Merge: 138c859 5ee80be
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Sep 27 13:28:44 2013 +0200

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

    commit f6ef4f1d8972e1363d8b778253281f679c861e53
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Sep 27 13:13:30 2013 +0200

        re-added wordlinterface support for writing svars

    commit 25b294eba615eda690b4a31819bfa8fd6465bbc8
    Author: Bacon <Bacon@butchery.com>
    Date:   Mon Sep 16 14:31:55 2013 +0200

        Extended IOReg

    commit 7c7ac324488b3830cf986610fb967b42d13c409e
    Merge: 2cfa057 8ad5ea4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Sep 14 01:47:12 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

    commit 2cfa057caaa2e73c8d05c94a18714ffabdff9f3c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Sep 14 01:46:55 2013 +0200

        adjustments for overlay rendering

    commit 8ad5ea409fd8f34680fb92470b644dfb7d767dee
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Sep 13 18:42:11 2013 +0200

        Added replace for svalset

    commit 2abb6d33d9c6eb3c67b3ecd4c61f694c18dc42ca
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Sep 12 19:21:08 2013 +0200

        (hopefully) fixed bug leading to multiple received event after registering a handler twice

    commit a54b66ddb628eaea52e5cb0226fccf9e2e1caec1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Sep 12 17:19:27 2013 +0200

        integrated changes by frederik

    commit 8a49bbc79e7f08117d896e2fbb4cdd571dbdb487
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 18:04:56 2013 +0200

        ...

    commit a180dd029ef2212b24cf384d620e31497bd48b69
    Merge: f9c6501 7e40d58
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 16:10:00 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

    commit f9c6501ef3476ac9f495ca17076569ae9f3353f3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 16:09:35 2013 +0200

        started repairing late component registration problem

    commit 7e40d58c4448d04d8eda121eb6d01c5d2a1972d7
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Sep 10 13:02:18 2013 +0200

        Started Dragon Dicatate Remote Adapter

    commit 1ba27ce25341b492fd91d520bac04c7c48e2f061
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 12:39:16 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

        Conflicts:
        	components/ai/feature
        	core

    commit 50ae0d218e54b6fe81aab11cba495718137cc661
    Merge: 3795061 b8f1cbf
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 12:24:25 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

        Conflicts:
        	src/simx/core/entity/typeconversion/ConversionInfo.scala
        	src/simx/core/svaractor/SVar.scala

    commit 3795061ee5aedfe161872763ec7711d35754cbfd
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 10 12:17:45 2013 +0200

        preparations for new converters

    commit b8f1cbf0163933011cfda455370b830c8c23a1c1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Sep 10 09:13:56 2013 +0200

        TypeTag->ClassTag

    commit 89c97bd9d24205c59bbc18690528c6e8f809a154
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Sep 9 16:52:22 2013 +0200

        Adepted akka 2.10.2 remote config

    commit 185435086ef6c6690b9a254ae3344f63ba6e4393
    Merge: 3ce7802 d3c8aea
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Sep 6 11:02:17 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

    commit 3ce7802239c80318275cd7a63cf1b5d6a4012106
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Sep 6 11:01:16 2013 +0200

        made types package consistent

    commit d3c8aea5994e1a383d74f22ff4d37dad9eb6a3b4
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Sep 4 18:10:18 2013 +0200

        Continued feature component

    commit d390c2f91c5c211697460bec615edda6364b5d76
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 3 19:33:09 2013 +0200

        updated type system & fixed component registration race condition

    commit b3fb12cccd410e63346a39b1662915e3b3b60741
    Merge: 809bf78 86fc914
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 3 17:58:26 2013 +0200

        Merge branch 'origin/scala-2.10-upgrade'

    commit 809bf78a1def4beeb15a08c4f6091ea4704a793c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Sep 3 17:54:01 2013 +0200

        wip

    commit 86fc914458c168f543e41d9b0d0c993e6676aa1f
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Sep 3 17:46:50 2013 +0200

        Started feature component

    commit 5ee649fda776c0f84e31d930550cd3b1cd56ef3a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Sep 2 20:16:43 2013 +0200

        create for components now supports handlers

    commit 077b43abf7cfc18a1461bc2bbc22f6eca608dfd4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Sep 2 15:43:30 2013 +0200

        changed some types to constant types

    commit 7aab7176df990804c347f67ac08ccb2d534733ee
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 30 18:03:19 2013 +0200

        fixed stuff

    commit 204a485cf22f4bf04fe65c2196040406e5746ce1
    Merge: d089074 cef5c58
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 30 17:16:56 2013 +0200

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

    commit d08907480909595d48a5b713540c9c39b1ba647b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 30 13:12:15 2013 +0200

        updated typeinfo system (started)

    commit cef5c589d271748025dfd860398d61ee5bda3130
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Aug 29 19:23:40 2013 +0200

        Continued fixing the editor

    commit fe402dfa4c21eb09c1d182e96276aa59cf663045
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Aug 27 13:26:16 2013 +0200

        fixed debug output

    commit 8e9a0036332481ae31dc19acb41c703d49504c61
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Aug 27 12:21:17 2013 +0200

        more cleanup

    commit 759e293bc4e2f04a89a492a77df83bb586c56a66
    Merge: 5f2ae75 01b2c48
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Aug 27 12:06:12 2013 +0200

        cleanup

    commit 5f2ae752b6069c653629c939c9ee1e18af4a0e1e
    Merge: bf0b5eb 5ee80be
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Aug 27 11:49:09 2013 +0200

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

    commit bf0b5ebea8d59ccaf48668df91e9dcd1c6b5c0ca
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Aug 27 10:37:57 2013 +0200

        cleanup

    commit d1f703b3eafea674958371ff6fd9d1eb415cb025
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Aug 26 17:27:21 2013 +0200

        Splash fix

    commit 5ee80be1b0d7ca13edba68c3f41bf340735edd5e
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Aug 26 16:47:05 2013 +0200

        Updated SValSet

    commit 202c9aa961d7190f093c92ff398a7210925f2664
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Aug 26 15:09:11 2013 +0200

        Remaned some methods in sval set.
        Made values public in Event

    commit 273382c81950dfe8070e726dfe91ad46f84a3700
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Aug 12 11:12:06 2013 +0200

        cleanup

    commit 1bda143009ecf0daec534d57b9a90376b5d0cd8b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Aug 12 09:42:40 2013 +0200

        cleanup

    commit 138c8598b3ae869a3298dbd866e7bd35dceee496
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Aug 12 08:19:34 2013 +0200

        updated ivy.xml

    commit 6740c94f2d67c697aefa024cfdbc1605dbcdd9b0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Aug 7 18:42:02 2013 +0200

        scala 2.10 again

    commit d6e7a690b5af299b098e5dddbbae94855ede74a0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Aug 5 17:52:05 2013 +0200

        updated to scala 2.10.2

    commit a57afe7a14aa423f97257c9b133f917530bb2b29
    Merge: 8c49617 83625a1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 2 12:59:17 2013 +0200

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

    commit 8c496171d696d11bc9ccf0d330959c57e34e9c0d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 2 12:59:10 2013 +0200

        switching to scala 2.10.2

    commit 83625a19aeae08dc1726038346594de10f362aa2
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Jul 31 20:39:45 2013 +0200

        Fixed a bug @ event emitting
        Added support for simple remote connections

    commit 850b52ae23ef20e26e485d255fe52afccaa2c930
    Author: Alexander Strehler <rplc.alex@gmail.com>
    Date:   Fri Jul 26 16:19:24 2013 +0200

        SwitchEyes added

    commit 901fc4fa28343e47a732b87f629cda5f4617eada
    Author: Alexander Strehler <rplc.alex@gmail.com>
    Date:   Fri Jul 26 16:19:09 2013 +0200

        again up to date

    commit 366d4586034928baa595615a63f65f5d9c6e1fb0
    Merge: 09b053d ae0c5f0
    Author: Alexander Strehler <rplc.alex@gmail.com>
    Date:   Fri Jul 26 13:48:52 2013 +0200

        Merge branch 'master' of ssh://trinity/var/git/projects/siris-modules/core

        Conflicts:
        	src/simx/core/ontology/types/Types.scala

    commit ae0c5f0e62fafdf2da5fb73276fe164438bc5fb9
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu May 30 22:46:35 2013 +0200

        Introduced TextureData

    commit 9af665db2d0a0420c6c332f5db840e11bdbe2a38
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 23 18:11:48 2013 +0200

        added ++= to SValSet

    commit 7617e13097bc9bfbe849818500056a0bac3d0b69
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sun May 19 13:04:51 2013 +0200

        Fixed bug after SValSet migration

    commit 0b2209288ff55ee530988bd0b3b25c3fa474ec1b
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sat May 18 18:38:45 2013 +0200

        Removed ontology files

    commit adcc9052d4ffc6feaf9cd729369706ea725c2ab6
    Merge: 08ae1f6 d7fe065
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 13:00:54 2013 +0200

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

    commit 08ae1f6aaac15ede106dc74940024ad00664614b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 13:00:47 2013 +0200

        ask error information

    commit 7331badaddb5b8576d8402202d6cc2d6d1fa1710
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 12:56:40 2013 +0200

        added information on bad returns for ask

    commit 9f233b4d640d85c60e8b0fc1f98847ea6d3a66ee
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 01:20:17 2013 +0200

        removed old serialization classes

    commit d7fe06541820cfafd1843b5cae4bc3588719b20e
    Merge: 8609e96 73a1b33
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 00:08:35 2013 +0200

        Merge branch 'github-release'

    commit 566585034b033fa64e2ad58e41e711778ab6fb88
    Merge: 73f415a 73a1b33
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 14 00:08:35 2013 +0200

        Merge branch 'github-release'

    commit 73a1b3374b6f84b3ad44bae3f3574d19f6abeb29
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 20:40:25 2013 +0200

        touched

    commit 8609e9674cdd603cdd30aadd9be44ba7d5bc25c1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 20:30:08 2013 +0200

        .

    commit 73f415aaa47d8f9c0c313495d96c8cbcfa81afbd
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 20:30:08 2013 +0200

        .

    commit da8db26c808cfb5040061dd73c8112442415224e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 20:19:08 2013 +0200

        cleanup

    commit 769aa51bd16ea81d0e16a49577373fcfbcec1766
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 20:19:08 2013 +0200

        cleanup

    commit 781905554c916a49d1b07726d11b52f895dc9259
    Merge: b5cd8df e870464
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 15:49:48 2013 +0200

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

        Conflicts:
        	src/simx/core/helper/SVarUpdateFunctionMap.scala

    commit 89d0c2d582275a369bb0f3760b786ea5a28ab7bb
    Merge: 1c17c81 9005d74
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 15:49:48 2013 +0200

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

        Conflicts:
        	src/simx/core/helper/SVarUpdateFunctionMap.scala

    commit b5cd8dfe24af6e3f2f1873b61024664587a9af70
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 15:45:33 2013 +0200

        added update map, made svallist an svalmap

    commit 1c17c811fef3bdf6a7dc56f9bdc010f538c945ef
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 13 15:45:33 2013 +0200

        added update map, made svallist an svalmap

    commit e87046469ed603c730dcf6d89a07ede52e6cae08
    Merge: 746f97e 2722774
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sat May 11 15:38:22 2013 +0200

        Merge remote-tracking branch 'refs/remotes/origin/master'

    commit 9005d74952fdf15fd7308f62b98395bb5a81ec93
    Merge: 189765a c3130a1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sat May 11 15:38:22 2013 +0200

        Merge remote-tracking branch 'refs/remotes/origin/master'

    commit 746f97ece28f09f2c1f7d7dc6f8bbf72ca8dfa5e
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sat May 11 15:37:30 2013 +0200

        Fixed bug that occured when using multiple subelements of one type
        Upgraded SVarFunctionUpdateMap to hande multiple svars of one type

    commit 189765a52f2fe1155cc702ece35cfa77111ffb78
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Sat May 11 15:37:30 2013 +0200

        Fixed bug that occured when using multiple subelements of one type
        Upgraded SVarFunctionUpdateMap to hande multiple svars of one type

    commit 27227745f22e7907b1fc9947e83977278b24d152
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 9 13:54:13 2013 +0200

        beautifications

    commit c3130a1a6a9c8bb0ecfb00e62039179d140da4d1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 9 13:54:13 2013 +0200

        beautifications

    commit c79612f5f13577e057bcf78652d7d341b9fd8ac0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 9 01:46:02 2013 +0200

        further ask improvements

    commit 38a795ecab7f1076978faa30e57db950307fd8bd
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu May 9 01:46:02 2013 +0200

        further ask improvements

    commit 68ef515410ed90445f6253b08e1fd270deebf920
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 8 18:50:50 2013 +0200

        some work on delayed answers

    commit ab6dcc0f0f2ce4bbe1b2a9aadc0d9b42d700a6ec
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed May 8 18:50:50 2013 +0200

        some work on delayed answers

    commit e772d166a69780120c933bd1243071433f285c20
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 18 11:45:14 2013 +0200

        removed deadwatch temporarily

    commit 964bab8576a252ea10a91adb33b7ed113b6e9c45
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 18 11:45:14 2013 +0200

        removed deadwatch temporarily

    commit c37116d2c68bd8686c50fbb3d32f4a2c276bb489
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 18 11:41:40 2013 +0200

        made simx logo look fancier ;)

    commit 04e243f5faafb82b0219880fb5c379d0567abdc6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Apr 18 11:41:40 2013 +0200

        made simx logo look fancier ;)

    commit e3c32176225aceccceda0985bc26b5c695557434
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 17 08:46:24 2013 +0200

        removed some TODOs

    commit 0cb8d2fbb1bee4633194178f49433d9e959b8f65
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 17 08:46:24 2013 +0200

        removed some TODOs

    commit a4b38055a6c55ee38bae133e4b308d52f0531707
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Apr 15 10:03:39 2013 +0200

        added top-bottom stereo support

    commit ae69b06c1a2f55a91665729264e00b0e9b36019d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Apr 15 10:03:39 2013 +0200

        added top-bottom stereo support

    commit 9c4713f7d675e644142fc5a44824b9dbaaa1a282
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 10 01:09:09 2013 +0200

        more improvements on handler support

    commit 26c78d064a89b27b78dfcb9b292ac69e677f42b7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Apr 10 01:09:09 2013 +0200

        more improvements on handler support

    commit cd017c7527e9f9024414405fdd59a4ffe2a0bcef
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 19:15:29 2013 +0200

        adjusted some handler functionality (removed a future ;) )

    commit 25e0bfc33e6b8157dfd2081204720f6296f9d3c8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 19:15:29 2013 +0200

        adjusted some handler functionality (removed a future ;) )

    commit b9e471c2d4d1a628d5a82f579da569a638242a68
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 15:14:42 2013 +0200

        .

    commit e08795797db162c9bd9cb7fb740381dd35a8bd2b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 15:14:42 2013 +0200

        .

    commit 638d87280f0c809f61ab252d54cbc56083f1b158
    Merge: ab8a7dc 095cbea
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 15:06:33 2013 +0200

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

        Conflicts:
        	core.iml
        	src/simx/core/Configuration.scala
        	src/simx/core/component/ComponentInitialization.scala
        	src/simx/core/component/FeatureAdding.scala
        	src/simx/core/components/io/IODeviceProvider.scala
        	src/simx/core/components/io/IORegistryHandling.scala
        	src/simx/core/components/naming/NamingComponent.scala
        	src/simx/core/components/physics/PhysicsComponent.scala
        	src/simx/core/components/physics/PhysicsConfiguration.scala
        	src/simx/core/components/physics/PhysicsCreateParameter.scala
        	src/simx/core/components/physics/PhysicsEvents.scala
        	src/simx/core/components/physics/PhysicsExceptions.scala
        	src/simx/core/components/physics/PhysicsMessages.scala
        	src/simx/core/dynamics/Effect.scala
        	src/simx/core/dynamics/Method.scala
        	src/simx/core/dynamics/Plan.scala
        	src/simx/core/dynamics/Prerequisite.scala
        	src/simx/core/dynamics/Procedure.scala
        	src/simx/core/entity/Entity.scala
        	src/simx/core/entity/component/EntityConfigLayer.scala
        	src/simx/core/entity/component/EntityCreationHandling.scala
        	src/simx/core/entity/description/Dependency.scala
        	src/simx/core/entity/description/EntityAspect.scala
        	src/simx/core/entity/description/EntityConfiguration.scala
        	src/simx/core/entity/description/SVal.scala
        	src/simx/core/entity/description/SValList.scala
        	src/simx/core/entity/typeconversion/ConversionInfo.scala
        	src/simx/core/entity/typeconversion/ConvertedSVar.scala
        	src/simx/core/entity/typeconversion/Converter.scala
        	src/simx/core/entity/typeconversion/ConvertibleTrait.scala
        	src/simx/core/entity/typeconversion/ProvideAndRequire.scala
        	src/simx/core/helper/Execute.scala
        	src/simx/core/helper/Loggable.scala
        	src/simx/core/helper/SchemaAwareXML.scala
        	src/simx/core/ontology/EntityDescription.scala
        	src/simx/core/ontology/SVarDescription.scala
        	src/simx/core/ontology/Symbols.scala
        	src/simx/core/ontology/entities/Entities.scala
        	src/simx/core/ontology/entities/EntityCreationComponent.scala
        	src/simx/core/ontology/entities/EntityDescriptions.scala
        	src/simx/core/ontology/entities/Subelement.scala
        	src/simx/core/ontology/referencesystems/Coordinates.scala
        	src/simx/core/ontology/referencesystems/ReferenceSystem.scala
        	src/simx/core/ontology/types/NullType.scala
        	src/simx/core/ontology/types/TypeDefinitions.scala
        	src/simx/core/ontology/types/Types.scala
        	src/simx/core/svaractor/handlersupport/HandlerBenchmarking.scala
        	src/simx/core/svaractor/handlersupport/HandlerSupport.scala
        	src/simx/core/worldinterface/WorldInterfaceActor.scala
        	src/simx/core/worldinterface/WorldInterfaceHandling.scala
        	src/simx/core/worldinterface/WorldInterfaceMessages.scala
        	src/simx/core/worldinterface/eventhandling/EventDescription.scala
        	src/simx/core/worldinterface/eventhandling/EventHandler.scala
        	src/simx/core/worldinterface/eventhandling/EventHandlerAdding.scala
        	test-src/simx/core/svaractor/test/SVarActorSpec.scala
        	test-src/simx/core/svaractor/test/SVarSpec.scala

    commit 5f7cfe2761de675e7dee9b1da041aa2eda9df62d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 15:06:33 2013 +0200

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

        Conflicts:
        	core.iml
        	src/simx/core/Configuration.scala
        	src/simx/core/component/ComponentInitialization.scala
        	src/simx/core/component/FeatureAdding.scala
        	src/simx/core/components/io/IODeviceProvider.scala
        	src/simx/core/components/io/IORegistryHandling.scala
        	src/simx/core/components/naming/NamingComponent.scala
        	src/simx/core/components/physics/PhysicsComponent.scala
        	src/simx/core/components/physics/PhysicsConfiguration.scala
        	src/simx/core/components/physics/PhysicsCreateParameter.scala
        	src/simx/core/components/physics/PhysicsEvents.scala
        	src/simx/core/components/physics/PhysicsExceptions.scala
        	src/simx/core/components/physics/PhysicsMessages.scala
        	src/simx/core/dynamics/Effect.scala
        	src/simx/core/dynamics/Method.scala
        	src/simx/core/dynamics/Plan.scala
        	src/simx/core/dynamics/Prerequisite.scala
        	src/simx/core/dynamics/Procedure.scala
        	src/simx/core/entity/Entity.scala
        	src/simx/core/entity/component/EntityConfigLayer.scala
        	src/simx/core/entity/component/EntityCreationHandling.scala
        	src/simx/core/entity/description/Dependency.scala
        	src/simx/core/entity/description/EntityAspect.scala
        	src/simx/core/entity/description/EntityConfiguration.scala
        	src/simx/core/entity/description/SVal.scala
        	src/simx/core/entity/description/SValList.scala
        	src/simx/core/entity/typeconversion/ConversionInfo.scala
        	src/simx/core/entity/typeconversion/ConvertedSVar.scala
        	src/simx/core/entity/typeconversion/Converter.scala
        	src/simx/core/entity/typeconversion/ConvertibleTrait.scala
        	src/simx/core/entity/typeconversion/ProvideAndRequire.scala
        	src/simx/core/helper/Execute.scala
        	src/simx/core/helper/Loggable.scala
        	src/simx/core/helper/SchemaAwareXML.scala
        	src/simx/core/ontology/EntityDescription.scala
        	src/simx/core/ontology/SVarDescription.scala
        	src/simx/core/ontology/Symbols.scala
        	src/simx/core/ontology/entities/Entities.scala
        	src/simx/core/ontology/entities/EntityCreationComponent.scala
        	src/simx/core/ontology/entities/EntityDescriptions.scala
        	src/simx/core/ontology/entities/Subelement.scala
        	src/simx/core/ontology/referencesystems/Coordinates.scala
        	src/simx/core/ontology/referencesystems/ReferenceSystem.scala
        	src/simx/core/ontology/types/NullType.scala
        	src/simx/core/ontology/types/TypeDefinitions.scala
        	src/simx/core/ontology/types/Types.scala
        	src/simx/core/svaractor/handlersupport/HandlerBenchmarking.scala
        	src/simx/core/svaractor/handlersupport/HandlerSupport.scala
        	src/simx/core/worldinterface/WorldInterfaceActor.scala
        	src/simx/core/worldinterface/WorldInterfaceHandling.scala
        	src/simx/core/worldinterface/WorldInterfaceMessages.scala
        	src/simx/core/worldinterface/eventhandling/EventDescription.scala
        	src/simx/core/worldinterface/eventhandling/EventHandler.scala
        	src/simx/core/worldinterface/eventhandling/EventHandlerAdding.scala
        	test-src/simx/core/svaractor/test/SVarActorSpec.scala
        	test-src/simx/core/svaractor/test/SVarSpec.scala

    commit ab8a7dc6141451e06551606fb27f85c96c19a332
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Apr 9 14:00:48 2013 +0200

        removed TODO

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

        initial_commit

    commit 679d5b8a3f54ffefb6f502d24da518984be43517
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 25 15:12:48 2013 +0100

        fixed sval list

    commit 01035751d81e570e660f7334bdb1e2b7c1c74034
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Mar 20 18:05:51 2013 +0100

        major changes on converter selection

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

        added single symbol

    commit d8148146babe1c71b27342d0e7a00c2a1e865a3c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Mar 15 17:22:56 2013 +0100

        added documentation

    commit 48ee08d33ae52e24dd4dd7d4dee2e63cc1fcb76f
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Mar 13 09:17:42 2013 +0100

        - Scala doc and requires

    commit 069efbc24d75f83f8475770658411cc6a719957c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Mar 12 19:02:47 2013 +0100

        - Distributing components works again

    commit d9df9a7055260773c0cc06c25fa4d29efc8431b4
    Merge: 27517a4 8b458ba
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Mar 12 16:00:21 2013 +0100

        Merge branch 'akka-migration-dennis'

        Conflicts:
        	src/simx/core/SimXClusterApplication.scala
        	src/simx/core/svaractor/SVarActor.scala
        	src/simx/core/svaractor/SVarImpl.scala

    commit 8b458ba59da63db4b0969b20daa495b02ee699f4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Mar 12 15:53:06 2013 +0100

        using project sdk

    commit 8651d7c613f2f141ac2e2d83b0a4c33ff5fe6724
    Merge: 1879b30 fc119d8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Mar 12 10:17:19 2013 +0100

        Merge branch 'akka-migration-dennis' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/core into akka-migration-dennis

        Conflicts:
        	src/simx/core/SimXClusterApplication.scala
        	src/simx/core/entity/component/EntityCreationHandling.scala

    commit 1879b30fd23d45466d2ab8aac0a619fbe3b7f441
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Mar 12 10:14:03 2013 +0100

        cleanup, green it and renaming

    commit fc119d8aead26f0a86415107af6dee45031292d0
    Merge: 85f12cb 95ffd1c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Mar 11 20:00:53 2013 +0100

        Merge branch 'akka-migration-dennis' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/core into akka-migration-dennis

    commit 85f12cb9dda570994c585a085fe55d87299f9245
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Mar 11 19:23:19 2013 +0100

        - Removed by debbunging println's

    commit fd4a3653d8950e671ffb1d7bbad657e8dc2fbf3c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Mar 11 19:08:46 2013 +0100

        - I don't know why, but if you're using akka, also the parent classes of the messages need to be serializable

    commit 95ffd1c562b9dd577671c0c44122d5d506566bba
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 11 18:05:49 2013 +0100

        cleanup

    commit 8a8f815d22e55d13e3041ffe7d84666c6b13fcfa
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 11 17:46:27 2013 +0100

        cleanup

    commit 4a1b589c75287b0e95fd60e67cfb2867e641bcaa
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Mar 11 14:06:00 2013 +0100

        added type infos

    commit 4e6995d1dec0b80db1bbc0c267896ec174563f90
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Mar 11 10:52:56 2013 +0100

        - Scheduler adjustment

    commit 7641bfccaff474c681836e171b85fdf7464e01b0
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Mar 10 17:36:00 2013 +0100

        - Opens window on a remote system, but entity construction does not work

    commit dbab67d2a7ba5d61a5d2b92bf4943bc8fed95309
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Mar 10 07:36:16 2013 +0100

        - A connection subsystem

    commit 4a269e914ea09013af1d687b25f963c4aa5f66d0
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Mar 9 11:06:42 2013 +0100

        - Compiles again

    commit e49b0f37494c72ddee7e54fd36872ebf6b57dce5
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Mar 9 10:46:32 2013 +0100

        Removed old clustering subsystem

    commit a35b9e39eb78c06f703c6fc43b128c7ed2428d5c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Mar 7 09:38:53 2013 +0100

        - Fixed library

    commit 27517a4b673e0e5048e8e59f38ca2b417a040066
    Merge: 3cbf075 bc89af7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Mar 5 19:03:57 2013 +0100

        Merge remote-tracking branch 'refs/remotes/origin/master' into HEAD

        Conflicts:
        	src/simx/core/SimXClusterApplication.scala
        	src/simx/core/svaractor/SVarActor.scala

    commit 0c3538e380a05de5ef12041ee74ec51011aeaa9c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Mar 1 16:53:56 2013 +0100

        bugfix in svarimpl

    commit 63ba314c989c3b4de596628c6fe32621f044ff8c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Feb 28 21:29:27 2013 +0100

        worked on simthief

    commit 21c747136e596162264a35c9627fc04b640a2ef7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Feb 28 16:05:50 2013 +0100

        minor fix

    commit 4a4ee10c9f64fe005274d878e837d3532e7be628
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Feb 28 00:12:58 2013 +0100

        adjusted scheduler settings

    commit e9153aac0e93f1a3b1702141e1e34cf70752e0f6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 27 21:48:24 2013 +0100

        started switch to akka

    commit bc89af78d0e6a9a3255298981f3eac3ef5673392
    Merge: 9a91c0a 07d5872
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Feb 24 11:34:57 2013 +0100

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

    commit 9a91c0a33520c7e67a544b2da07bcd23ee411aa4
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Feb 24 11:29:47 2013 +0100

        - changes

    commit 3cbf075a11df01ae40521c6bc1c51de9ae6b443e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Feb 24 00:19:35 2013 +0100

        cleanup

    commit 09b053d3f48820cbcbd0158b5770658ff8711ef4
    Author: Alexander Strehler <rplc.alex@gmail.com>
    Date:   Sat Feb 23 15:05:03 2013 +0100

        added: switching between left and right eye

    commit 07d5872f86bfb1947906ae2e55d7fd847971e38d
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Feb 19 17:05:20 2013 +0100

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

    commit b553ebc994e6fb836a2ec932fd0e68a861ca6e61
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Feb 19 15:59:49 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 4f5f010717288cea48b678d58ad779863cb8237b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Feb 15 18:18:59 2013 +0100

        worked on annotations

    commit 6d463f904a7b3491e3b44bf2929486d9a0c8fcf6
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Feb 15 11:59:38 2013 +0100

        bugfix

    commit ffcc7af397bdb9ce4df3f89348949f9dd4a85bab
    Merge: 2917c2b 9465d38
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Feb 15 11:47:22 2013 +0100

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

        Conflicts:
        	src/simx/core/SimXApplication.scala

    commit 2917c2b63543acf347ff011ba542d124bb5802f8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Feb 15 11:40:05 2013 +0100

        ontology generated types

    commit 9465d385faff0ca8b1be2782197f799962c19fe2
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Fri Feb 15 10:34:10 2013 +0100

        Adepted TuioExample and ExampleApplication, removed PhysicsEditorExample
        Improved Configurations usage and error handling

    commit e60ee726e5d79643c8db420065535013cdf63cdc
    Merge: 02d7900 f6e4b12
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Feb 14 17:24:45 2013 +0100

        Merge remote-tracking branch 'refs/remotes/origin/master'

    commit 02d7900d0c3b91c1ddc6a6946ba98806b4282112
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Feb 14 17:24:28 2013 +0100

        Reworked the basic example to address more basic simx concepts

    commit f6e4b12a81a80a8ae4808d3009e77a4818d6b763
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 13 19:18:02 2013 +0100

        missed one symbol before

    commit 01c529ae6882a451e6d755444ffc4cf285445595
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 13 17:52:04 2013 +0100

        added generated symbols.scala

    commit dca9cb6c157fcf0ecd5210b85ec6933f563e6e78
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Jan 30 17:15:34 2013 +0100

        added timestamp

    commit fec1bb911e3d06ad45b2ec3ed8971772ed17d168
    Merge: 9536f11 582604d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Jan 30 16:52:39 2013 +0100

        Merge branch 'master' into vrpn4alex

    commit 582604d1dcf00cf2b3d10b7797ed8d238f62431d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Jan 30 16:46:05 2013 +0100

        added timestamp symbol

    commit 95056712201f37ef850bf16e0ae61a33ab076a4c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Jan 19 21:39:08 2013 +0100

        added damage symbols

    commit 24cb329026fa871c11b83ff30e37713072ecdb5c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Jan 19 17:13:20 2013 +0100

        bugfixings regarding entity removal

    commit 48d6acb9c710119819e9c11753521926dd7713a7
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Jan 4 08:53:10 2013 +0100

        -

    commit 9536f117205601b9309d8ce310ecfe24ab09dd92
    Merge: 7aef2fe e4dcf21
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Dec 19 11:02:34 2012 +0100

        Merge branch 'master' of ssh://trinity/var/git/projects/siris-modules/core into vrpn4alex

        Conflicts:
        	src/simx/core/ontology/types/Types.scala

    commit e4dcf21917b8e368bdc0b6222caf9157807b5a34
    Merge: 583e91d e74782c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 18 17:53:47 2012 +0100

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

    commit 583e91dc30be7c838d99a6df587a3cb874e7a14a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 18 17:49:09 2012 +0100

        bugfixes and nicer output on errors

    commit e74782cf12e70a91cca2ec8219738aea44c125f9
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Dec 6 17:42:58 2012 +0100

        Added splash screen

    commit beab44912b4f2ae49afbcdb349ac9ff787d90828
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Dec 4 17:51:23 2012 +0100

        removed aspect base to fix some todos

    commit 000e9e8ec1039d657c2f69fc89278d95d8ddc430
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Dec 2 23:01:21 2012 +0100

        more on dependencies

    commit ea940e5894176e384159912d3b638be493404a2e
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Dec 2 22:28:15 2012 +0100

        - Several adjustments for the benchmarks

    commit efe926a2a99cb6ca25ccacd1b35776943e5f7216
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Dec 2 19:03:42 2012 +0100

        added multiobserve functionality

    commit 919ac5e8f1477c6e5aa0e939c4711c8e61bec006
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sun Dec 2 15:57:24 2012 +0100

        fixed error in dependency providing

    commit e8684c4c3851d19e38f1c91d23a20030678595ea
    Merge: 37b02d4 43139e4
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 29 10:24:44 2012 +0100

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

    commit 37b02d4bea35a4b1be408b8fb67db97b74f70b4a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 29 10:23:51 2012 +0100

        added requirings to the getAdditionalDependencies method

    commit 43139e4b7a60a5df44e1137f2f013c54914cc769
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 29 10:15:38 2012 +0100

        Added scalaHome to configuration

    commit ecec3d2d3a436deff4dccf1cb28ad34950f64a08
    Merge: 47853fd 2163c07
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 29 10:10:16 2012 +0100

        Merge remote-tracking branch 'origin/master'

    commit 47853fd86f271a0f6402fdb922f2ecfb4ed98bbe
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 29 10:09:52 2012 +0100

        Added new functions to jvmtools

    commit b390af37fbea15d0590a368e4905cce3756ea86e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 28 19:35:16 2012 +0100

        now sending a clone of svar lists to components, to ensure no changes to the original list can be done (this does not fix anything but prevents errors)

    commit 2163c07081619848de3342db5cf6af20a35230aa
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 28 14:22:10 2012 +0100

        - Here ist te file

    commit f7d0f85b7784d21261b95662932a9f29530b93cd
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 28 14:20:59 2012 +0100

        - Added copyright notive to files that are maintained by me
        - Added LICENSE file

    commit 2103ff52fcec2244a75e55651a19d7c6e1acb041
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Nov 26 15:10:05 2012 +0100

        Fixed a merge bug

    commit ea49f3e205083cad78f522fdf34c3762475c59fb
    Merge: 194c1ad f548aa6
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Nov 26 15:08:41 2012 +0100

        Merge remote-tracking branch 'origin/master'

        Conflicts:
        	src/simx/core/helper/JVMTools.scala

    commit 194c1adc5302da48da75a6dbb4be7e2692b4dc94
    Author: martin <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Nov 26 14:47:21 2012 +0100

        Continued automatic native library loading.

    commit f548aa6c6cd8e1b92b5ade2f8298f4c67a0f5ca2
    Author: martin <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Nov 26 14:47:21 2012 +0100

        Continued automatic native library loading.

    commit 8bd629fc754a151bb9f550631cbd884404b31fe0
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 22 16:45:49 2012 +0100

        added texture svar support

    commit f6eb74c547e99ebf4f233ef864fe1a03631b575b
    Merge: b24febd 7cba1ba
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 21 16:38:24 2012 +0100

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

    commit b24febd56135eeb1eb169653efba96c9e6f0b95d
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 21 16:38:16 2012 +0100

        added enabled symbol

    commit 7aef2fefc9547bfc3e457f1c97136c0ac360f687
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Nov 20 17:17:04 2012 +0100

        added timeout

    commit 7cba1babf25f3ecdd46b1ddbc9a43a483d983e28
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Nov 20 16:53:23 2012 +0100

        Started automatic native library configuration.

    commit 86e69aefabd13178496570e188be5c36e9a8aaee
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 16 16:21:50 2012 +0100

        some modifications of the entity creation mechanism regarding subelements

    commit 3d3e66514e824f05e5e53650e0ae9bc3b4da00a3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 15 15:34:37 2012 +0100

        really fixed empty creation issue

    commit bb83ea6b655e269088feae3d9469f0fc7c6b9e41
    Merge: 0345c22 d8ffbab
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 14 16:59:58 2012 +0100

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

    commit 0345c22e9ca3156af08e5e1ba6bed50478cf0d92
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 14 16:59:16 2012 +0100

        fixed bug (empty aspects were not resulting in empty entities)

    commit d8ffbabee28aa5cdd52f2257a68306b9187f6477
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 14 15:36:17 2012 +0100

        More more fix in the clustering subsystem

    commit 3b97eb1a877bc4b7c8ed66ad6bc35c95e98e5418
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 14 14:28:08 2012 +0100

        - Fixed a bug in the clustering subsystem

    commit 01b2c48aad9409bad8266a6e73385b72c948842b
    Merge: 0f647a5 278c5f7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 14 14:05:37 2012 +0100

        Merge branch 'simthief-repair' of ssh://trinity/var/git/projects/siris-modules/core into siris-boardgame

    commit 8ef203966fbd09690e75566b4e3694901ba549d6
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 14 13:37:07 2012 +0100

        - Deleted unused file

    commit 0f647a5ba586d23a56846696e7b7a10615e4a2ca
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 14 12:00:35 2012 +0100

        added Texture symbol

    commit 278c5f7b7e2c027a095a4a47b0bb0287868dde51
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Nov 12 10:39:13 2012 +0100

        Added more symbols

    commit 734ec31ed06526a52ba00e2ddc47a108e3ba8ade
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Nov 11 17:01:31 2012 +0100

        - Fixed typo in documentation

    commit 34d22ae563fd924328b2f125efd0a4adbd19ac9b
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 9 12:56:07 2012 +0100

        - Some

    commit 38eaf4be857c49dbee81ca6efb159e5e10e60578
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 8 19:04:57 2012 +0100

        Added more symbols

    commit 5c6efc26bb59b8ba453d95ad62c2e3db447172b3
    Merge: 82d7729 23f0cea
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 8 16:43:44 2012 +0100

        Merge remote-tracking branch 'origin/simthief-repair' into simthief-repair

    commit 82d77290eb646f50e056e63aeb25c384614da3d3
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Thu Nov 8 16:43:33 2012 +0100

        Added symbols

    commit bdc93fb8d7e2d4d9732ce361125339311111f1fb
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 8 12:57:01 2012 +0100

        - Removed nearly all sim thief specific stuff

    commit 4c8a54d320a3a265c47477f611066dd594c68fc9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 8 12:31:59 2012 +0100

        - Removed more simthief specific stuff

    commit 5ea286f18e72aade337b1276092748725c5ed5f8
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 8 10:20:30 2012 +0100

        - Removed some sim thief specific stuff

    commit 8affec510251e1b7049418fe78337edd905fe719
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 20:06:54 2012 +0100

        - Reactivated some old tests and configured sbt to execute them. The tests needs to be rewritten

    commit 2e3febbb861aef18029166f1f4e2e509770c2dce
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 19:31:01 2012 +0100

        - Removed legacy spin locks an println's

    commit 2297ba9481169bc8dfb0d1bcbaf80c1b6ff6c265
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 18:44:43 2012 +0100

        - Documented the pingable actor

    commit 32ae6cd606ee9568f2fa9abc588c46c49c307fa1
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 18:38:19 2012 +0100

        - Documented the sync layer

    commit 144bb09b3b76ea1e89031b71e58dc466ede3615a
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 17:08:01 2012 +0100

        - Require and documentation for the most parts of the sync layer

    commit 37e759d2be9dab5e77f3bbdd6ae12750959fa0bf
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 15:37:11 2012 +0100

        - SyncGroup error handling

    commit 21bb6b043999706617c4cf13c02da59a238dbdb6
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 12:29:15 2012 +0100

        - SimXClusterApplication prints a help message and is documented

    commit f74cf4dcd301d1f257893d0a22d489195023dfb0
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 12:02:42 2012 +0100

        - Removed some unused or deprecated code

    commit 3479dc43c0c7033f13790ee011a46eef7e5f28f6
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 11:55:38 2012 +0100

        - Documented all the generic rendering stuff

    commit 26a5ac2f545bed7987e43bdae26943fe7d7a8d13
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 11:45:41 2012 +0100

        - Adjusted package name

    commit bf7f4ce3255ebf8d5312682a088e2228b741a61b
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 11:34:28 2012 +0100

        Documented renderer create parameter

    commit 2f05ae9698eaebe070289540d35a3c8746093847
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 7 11:10:08 2012 +0100

        - Documented the execution strategy and restructured some files

    commit abcfc8fed3d709ba7e23e099782915ae177f953c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 2 13:51:13 2012 +0100

        - Adjusted a package name

    commit e1a81ee5898d49d62a90b8e275a20f356d3781eb
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 1 15:55:16 2012 +0100

         Moved some classes

    commit df133d4af6d49154d1f5a073545551ff895a499c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 31 16:37:55 2012 +0100

        - Made many classes package private

    commit 245c4c497122fb91c4b26625fb2b2f9d1e716426
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 31 16:29:56 2012 +0100

        - Documented the clustering subsystem

    commit f96031ed25003a979e6eee41ba7fb6ed0c687320
    Merge: 502ae18 73d395c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Oct 25 12:45:45 2012 +0200

        Merge remote-tracking branch 'origin/master'

        Conflicts:
        	src/simx/core/entity/component/EntityConfigLayer.scala
        	src/simx/core/entity/description/SValList.scala

    commit 502ae18614773d7fd8421e2bea840d84d26c7e69
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Oct 25 12:35:29 2012 +0200

        Some additional modification for multiple svars in one entity

    commit 73d395ce701960759319540e742ef5c2bb795dfc
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Oct 22 16:57:42 2012 +0200

        - Some documentation

    commit e5505f95fb193e3b412ad12c2e31b86bd19fef36
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Oct 22 12:12:18 2012 +0200

        - Shader effects activated

    commit 486222f3ee80e17df49eed0dc8adb39d9cac585c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 21 22:05:46 2012 +0200

        - More renaming from SIRIS to SimX

    commit d68d2e3820b45807bc5dd733045751df73bcdf79
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 21 21:53:58 2012 +0200

        - The execution strategy can use sync groups as trigger
        - The observe method for sync groups consumes a handler function as parameter

    commit ea9b72e9cf71a6b0feb7aed71fb790f5b07bc1c8
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 21 12:30:32 2012 +0200

        - Removed Pluable Sync Layer
        - Fixed some issues in the SyncGroup

    commit 12b779663a320ced605e7f5b65fea2aa4acd9879
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Oct 20 19:45:25 2012 +0200

        - Fixed another bug

    commit 21f551a0961b69f3e7ce21e06e12cc384939e8d9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Oct 20 19:32:34 2012 +0200

        - Fixed a bug

    commit 2e50614a43083c76ee46701c8b33a54d5cda354d
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 19 09:52:29 2012 +0200

        - Renamed package from siris to simx

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

        - Made execution strategy message ready for clustering

    commit f85397c1afe0a17876bc82bf82d403d090680a4f
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Oct 18 16:00:06 2012 +0200

        - Compiled again

    commit c2d3060ffb92995271fefbe87f21eed44e8dd1c9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Oct 18 13:19:00 2012 +0200

        - Splittet trait into two files
        - Completed cache

    commit b5b7d980bd4999df427d6b4039bb8a7eedf8d745
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 17 17:08:19 2012 +0200

        - Some more implementation of the sync groups

    commit 77f39e089eee29b1d49f1973a1bfb08d688c0b40
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 17 14:53:38 2012 +0200

        - Some parts of the sync layer

    commit 406acdde32452179bbffc5cc372edba4c97f0f36
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 14 14:41:55 2012 +0200

        - Added default error handler

    commit 846f3ece7834799f6df655e886d5b5ad0f391b66
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 14 13:16:45 2012 +0200

        - Execution Strategy

    commit b024c92ab1027fcc2cab75ebe7a51bf16ed10df4
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Oct 13 21:04:49 2012 +0200

        - Removed TimeMeasurement Trait

    commit 347bd22b6b0624409c378aa05118d0bab472bd32
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 12 23:39:25 2012 +0200

        - Added scheduled execution ability to SVarActor
        - Added job scheduling to Component

    commit d60a281d87e5cc5055f920fc73795eedd5c722c9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 12 16:20:10 2012 +0200

        - Removed SVarActorLW

    commit adeab06d27a4e7f4f30492ba17c1124f81c06e40
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 12 15:45:28 2012 +0200

        - Removed SVarActorHW and SVarActorImpl

    commit 940897eb506e76a4dfebc26db23ae362ca8e35e3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 12 14:38:24 2012 +0200

        - Using the complete function

    commit 9c4e89ae9702ea93eb4bc2f146bf3b7e47044872
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 12 11:12:08 2012 +0200

        - New function in component interface
        - Implemented the new interface in several components
        - Moved RenderNextFrame message into the jvr package

    commit d7ee56cb3efbe112de2ec2d3405fb598ba1c0b76
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Thu Oct 11 15:07:09 2012 +0200

        - Eye separation in display description

    commit fbab14adb72be9d5164e9c07eca0d849476b7244
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 10 14:34:16 2012 +0200

        - Serialization

    commit 28b0ee8af2d111fa330628ec0dabe761436a7521
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 10 14:15:48 2012 +0200

        - Fix

    commit c12e5f792b534e208bd2b20712a5ab446d29941a
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 10 14:09:56 2012 +0200

        - Application registers it self at the Cluster subsystem

    commit 50bc2783402b1d99e144c33c99e49cfa21a43d60
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 10 13:21:05 2012 +0200

        - Less verbose cluster subsystem

    commit 64ec336110e05bbd0cb6926d165c5349955c43e3
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Wed Oct 10 11:50:28 2012 +0200

        - Restructured libraries

    commit 16b5826d723a74537a24757b7fe1186f2a2ffe59
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 7 14:56:23 2012 +0200

        - Repaired clustering

    commit 3357777600594c23ca9334ad3d715d82c8cd3477
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Oct 7 13:38:10 2012 +0200

        - Still trying to repair the clusteirng

    commit ed599cb0ea051df743429c379ce85da9399d7b12
    Author: Stephan <rehfeld@beuth-hochschule.de>
    Date:   Fri Oct 5 17:41:10 2012 +0200

        - Trying to repair the clusterin

    commit 99622584b4df3cd071264da1e992d5c431cc32f3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Oct 1 10:27:42 2012 +0200

        - Delted unnecessary file

    commit 37a575bb860f67a53bfd1a3bc11b66c49dcd8ed7
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Sep 22 15:11:55 2012 +0200

        - libraries
        - completed wii mote

    commit 614052168b7683f88c19e4760f1c6bcb7ec4918f
    Merge: f6a895d 23f0cea
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Sep 1 00:55:03 2012 +0200

        Merge branch 'simthief-repair'

    commit f6a895d16cf4d41d9d9d01523053649935555449
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Sep 1 00:54:57 2012 +0200

        ...

    commit 23f0ceace1d9da4587856c6ae1c3e78e084e63ea
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Aug 27 18:05:39 2012 +0200

        beautified entity toString method

    commit 127f768ab6a01fad05b606715e6bc204acf5ece3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Aug 24 11:32:47 2012 +0200

        removed old code

    commit 17649f5c67ae6f1f6d334d17af2f7c6fd6051cbf
    Merge: 77145c8 b94af5b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Aug 22 13:13:39 2012 +0200

        Merge branch 'simthief-repair' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/core into simthief-repair

    commit 77145c87b28ae9a19e1a3472c3820f43d1b6ba38
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Aug 22 13:10:47 2012 +0200

        commit before re-implementing ghost behavior

    commit b94af5b02d4032b03d9d7867e96a8ef8e8ca55f1
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Tue Jul 31 12:38:43 2012 +0200

        Added some symbols and types for the integration of the tuio component

    commit e6346547f180c3c3460e855b70224297cf0ef173
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Jul 30 17:46:36 2012 +0200

        Some new symboles and types

    commit 85bd9560131db9961eb817f48096b9c95327e0e2
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Mon Jul 30 14:20:18 2012 +0200

        removed sbt temp files

    commit c87ca0e8438b89128fe984f5357fc41437101f8b
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Jul 4 16:56:53 2012 +0200

        Restored the editor component.
        Some GreenIT.
        Added the editor to a bsic example.

    commit faa127d551410b135686cf63e470039dd5e182d5
    Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
    Date:   Wed Jun 27 15:39:15 2012 +0200

        Fixed ignoredWriters bug and some more

    commit 2c39ce66e6ba4fc512916808f2e6aa71e88c2634
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Jun 26 10:47:19 2012 +0200

        adjusted types and physics package

    commit 4a916ac629c84ff81722213aca54dc34e93652dc
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Jun 22 15:30:05 2012 +0200

        cleanup

    commit 45bd4be18f0697c0c9d19fcfe53766b90091abfe
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Jun 21 17:21:28 2012 +0200

        modified entity creation mechanism

    commit d67172024ff583ba728c51e5eed9f03fe708da1b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue May 22 11:59:28 2012 +0200

        added passing of actor context to svars

    commit 23dad6cf1749b951775af833269de5632785f36c
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon May 21 09:11:33 2012 +0200

        added implicits to svar methods

    commit 2b4b1e270828bb9d640527a308d1bad2240f6e95
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri May 18 17:03:31 2012 +0200

        simthief does compile again

    commit f1ab23db9d94d749a83f08fc7dcb5875695678b1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Feb 24 17:18:01 2012 +0100

        added dynamics

    commit fc710ce175011f64ae5bf9b4eecabb1b408007e3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 22 16:46:20 2012 +0100

        Revert "made entity immutable"

        This reverts commit 0de722f22bdf11fac60b701f0964fa001c7be729.

    commit 045beaa6b54aa8a4d1aea3e4cfaf919b5fb6300b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 22 16:45:02 2012 +0100

        Revert "..."

        This reverts commit ca4fa0b10005f6df9fab0319c0199015107756e3.

    commit b18ab64fa08b732dd2f07d436cac7207d280d311
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 22 16:04:18 2012 +0100

        added methods

    commit 0e4f7b0503ca69371cd81c7a38b0a65d86589522
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Feb 21 17:07:42 2012 +0100

        this and that

    commit ca4fa0b10005f6df9fab0319c0199015107756e3
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 15 16:41:05 2012 +0100

        ...

    commit 121975316e9f4e1a4e463d116eb78db9149be963
    Merge: 0de722f f7d4339
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 15 15:51:31 2012 +0100

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

        Conflicts:
        	src/siris/core/entity/EntityCreationHandling.scala
        	src/siris/core/entity/description/IEntityDescription.scala
        	src/siris/core/ontology/entities/EntityCreationComponent.scala

    commit 0de722f22bdf11fac60b701f0964fa001c7be729
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 15 15:09:24 2012 +0100

        made entity immutable

    commit f7d4339bb41e44dfe7d85a86010f16c9bc15efa6
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Feb 15 14:55:31 2012 +0100

        Revert "re-added reference-system registry (was commented out by stephan)"

        This reverts commit 7b5f4deecb195928c59a1ff04e8fb9d3f0ed4192.

    commit 3df573ac1995f709395c492cf778eeaecf424b21
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Feb 15 14:48:37 2012 +0100

        Revert "reinserted EntityCreation component (commented out by stephan)"

        This reverts commit b9f500f16201dbd0f456adedc513237bb98c36dc.

    commit b9f500f16201dbd0f456adedc513237bb98c36dc
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Feb 15 13:46:02 2012 +0100

        reinserted EntityCreation component (commented out by stephan)

    commit 7b5f4deecb195928c59a1ff04e8fb9d3f0ed4192
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Feb 14 10:17:48 2012 +0100

        re-added reference-system registry (was commented out by stephan)

    commit 1007c3acdc6349d04d4dd0011b91703a98554cfe
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Feb 14 10:09:45 2012 +0100

        some updates to make siris-production "compilable" again

    commit 781d62715d213bfe2780d6812a865878a344963a
    Merge: 23c2fe8 9f7e143
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Feb 14 09:25:04 2012 +0100

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

    commit 23c2fe81f6568b1287ff1146213c7ba64d90c019
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Feb 14 09:24:59 2012 +0100

        ...

    commit 9f7e1439209b808758d155acbd6c08f78a9a5f01
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Feb 13 17:53:20 2012 +0100

        Changed API

    commit e4598f28d5818d680bb78fea177316e0070d2c1c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Feb 13 13:29:38 2012 +0100

        - Pre change commit

    commit a7d45c52fc3a6cf54392413398391d29cf77d822
    Merge: 13e804d 917d0e3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 25 17:42:26 2012 +0100

        Merge branch 'cluster-integration' into stephan

        Conflicts:
        	core.iml

    commit 917d0e3a8e1dfef35369c6ced65dbdd95fca3c42
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 25 17:23:17 2012 +0100

        - Removed all spin locks

    commit 8834f4cd7b19efae49f2edaf67b38b207b65f439
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 25 17:11:09 2012 +0100

        - Migrated entity creation mechanism

    commit 4e229f846cce8d9cf8174887a24393d635aae76d
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 25 12:49:21 2012 +0100

        - Remove my old migration try

    commit 66a5649ff47dde5cfee8c8cd1b2cdebc0ca29b62
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Jan 20 15:28:13 2012 +0100

        - Need changes to Entity construction to continue

    commit 411d55871d1f4c39e49c4b54a5c375ef2c977e37
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Jan 20 15:00:12 2012 +0100

        - Huge step forward in removing spin locks

    commit eda6d596217a5528d3680cacb49766711c3b4f13
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Jan 15 16:43:42 2012 +0100

        -

    commit c1bb44b7cc2e69a73e2ac794e78da970a21d1e6a
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Jan 15 15:49:21 2012 +0100

        - Removed the half of all spin locks

    commit 836e62a25f9b7babfc564c8b1187361545271619
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 11:17:40 2012 +0100

        - Quit does now also work in cluster applications. All nodes are closing

    commit 798d24e6d3e77b821c36de0a9c4da2ec473732f3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 11:09:46 2012 +0100

        - Word Interface handling

    commit b8f1227da444c0676bfe78c22c50f11474781912
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 10:37:44 2012 +0100

        - The world interface actors a now published trough the cluster

    commit 7a519a1636cff3858b6bc72f68f889d20dfda4ad
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 10:26:56 2012 +0100

        - Added a message to the world interface to publish other world interface actors in the cluster

    commit 3cef5f4db30ef5e9bd92000556e260e3c236cc07
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 10:12:31 2012 +0100

        - Bugfix

    commit be77d316f09dca3c0aab5396f6f51b7b1342ce96
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 10:06:10 2012 +0100

        - Removed some printlns

    commit bbd386fc2851b43a5c6524eafe9933b61964c099
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Jan 4 10:03:12 2012 +0100

        - Changed the world interface to handle abstract actor instead of concrete types
        - Components do now register at the world interface by their self

    commit 49dc7e8e5b48a1cff13ec7cedd26f0847b25446f
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 29 11:25:03 2011 +0100

        - Now using createActor in actorFunctions internally

    commit aaa830b6e0c23de2471d16ae27ae2e7fe048b232
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 29 11:05:08 2011 +0100

        - First part of the constructor parameters for clustering

    commit 6be31e93c1c993d09dd9b01b55f059fb79000023
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 29 10:05:44 2011 +0100

        - Changes error handling, now using exceptions

    commit 31c0fd998de82e24055afda2eb2e14a5f89f7486
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 28 15:08:00 2011 +0100

        - Supporting parameters for constructors

    commit 9a73076064c2f85b7e6a776a769d8b404f92d3c9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 28 10:41:45 2011 +0100

        - Added a create function for actors
        - Change SIRISAppliaction, componentsCreated is now also necessary there

    commit 5271fb9fec4093c9d73804cc1b75f823c6d432aa
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Dec 27 11:27:37 2011 +0100

        - Error handling if a node was not found

    commit 205db4bb6a65e081382772081613ffa80f7bb91b
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Dec 23 13:31:25 2011 +0100

        - Fixed a bug

    commit 1363a313b0dfa4d041355dbdee104636b68b2e97
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 20:46:17 2011 +0100

        - Using transient annotation and made de/serialization code easier

    commit 706877136ae30d0176d12450ed4678c3e057b139
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 19:55:22 2011 +0100

        - Type bounds

    commit 4bc64a3ae3a7db72a957b79d5bd55a941f17fb38
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 19:52:16 2011 +0100

        - Renamed getActorOn to createActorOn

    commit 3694f3e6fe06764a84a850c0b3bd1172eb9bfc24
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 19:41:54 2011 +0100

        - --no-cluster option is working now

    commit 898ddcb77b97683b23e8211d6605a61e45409157
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 15:33:31 2011 +0100

        - Changed set of cluster nodes from val to def

    commit 58388818c96090a18c7d5cd504c4d9bc5438f139
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 22 15:18:52 2011 +0100

        - Removed parameter --master and --worker by --bootstrap-app

    commit 13e804d783367e5d295b0387218084f8d22d2ca5
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Dec 22 14:37:41 2011 +0100

        added global scala lib

    commit c98f553b9aa193d09460c9404e76984e27bf6d42
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 21 16:48:47 2011 +0100

        - A actor on local node can be created now

    commit e4d822ef5ce28be66c1abe50a4e14a0f6a888ec1
    Merge: 4c28943 01afe67
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 21 15:21:56 2011 +0100

        Merge branch 'master' into cluster-integration

    commit 01afe673f299c69e3b7cfeff3b6133620bc244bc
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Dec 21 09:39:38 2011 +0100

        reverted changes by test commit

    commit 48c08b3490a845ea65552f5c5cef698470a87d58
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Dec 21 09:38:56 2011 +0100

        test commit

    commit 4c2894310869756a5da271df8c9a35f3ccdab488
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Dec 20 18:30:10 2011 +0100

        - More documentation

    commit 28d24b5f7e5d52153fcab48bfa2dd4c8f99ffc93
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Dec 20 18:29:08 2011 +0100

        - Added node to Display Description

    commit 14b61e5fb6af44a766b9165656292a8836e0976e
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 22:14:43 2011 +0100

        - Less verbose
        - Set mutable entity to deprecated

    commit de0769a03eccdabe6b9bceb78ce934213916c07a
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 19:15:27 2011 +0100

        - Clustering does work now :-)

    commit ae7dc8c187c22e0fb310ed7a4a1e19b24c8efec1
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 16:42:05 2011 +0100

        - Close- Closerr

    commit 8c43a3f8e3fd32901cfe04d18da73ab856365d55
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 16:16:03 2011 +0100

        - Coming closer

    commit 9ee30568110fa602470ff937fd29c8d54d4d9756
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 10:47:32 2011 +0100

        - Migrated many functions of the entity creation
        - Found the reason why the PlainEntity was not serializable

    commit 0d9fe2b36d8f70d77a22ede691870a2f34c0e6f5
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 12 08:20:15 2011 +0100

        - Minor changes

    commit a7bae1c1dd0bbcd04db3a603fd1e7614c8850ba0
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 7 14:56:25 2011 +0100

        - Migrated sVar functions to Version4 API

    commit 77c019fb832b612626a33de875e657933a6ad138
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 7 12:19:47 2011 +0100

        - Next changes for big change

    commit 4e4de4a990455fccfd5087ea6218e2aa034fff1f
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Dec 7 10:34:36 2011 +0100

        - Non compiling commit in between

    commit d2ffd8fb9ad47b798e3132a32d71b8b70fb044a5
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Dec 6 18:57:59 2011 +0100

        - Commit before next heavy API restructureing

    commit 727a26db164e7aece6baab854176740c91df9da5
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 5 12:22:58 2011 +0100

        - Changes to get clusteres barrel stack running

    commit a076eefe1ac86eb8862d6741c0409946926732bb
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Dec 5 10:16:35 2011 +0100

        - Many changes to the core to get clustering running

    commit a6580463c6d053fa777217cc69f87373e1114474
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sat Dec 3 14:38:55 2011 +0100

        - Cluster request code

    commit bd266ba7dfc2f3ae8f5a8ee818d052e19c258fd3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Dec 1 13:23:39 2011 +0100

        - The components actors are now propagated to the used cluster nodes in the boot phase

    commit e8b86e1fde3ec842199738e83ab827f2659850b6
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Nov 29 16:37:22 2011 +0100

        - Added helper function for automatic (de)serialization of actors in a message

    commit 4e1e5b9b1322817831af95dc65417ab384e5abac
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Nov 27 23:43:07 2011 +0100

        - Deleted old Singleton
        - Copied documentation

    commit 2328dcbf780a26bdeaee891569e51111dda8c267
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Nov 27 23:15:59 2011 +0100

        - Removed something

    commit d7e306bdc0ac0aff10b482f13e0e1777dd99b689
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Sun Nov 27 22:04:37 2011 +0100

        - Migrated WorldInterface and companion stuff

    commit 9f68b2f05324d69040535d503d6a8b2ad8c4611c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 16:42:53 2011 +0100

        - Fix to SVarMessage serialization

    commit 97b633479453b18c1448f796089d4802ed60441d
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 15:15:31 2011 +0100

        - Serialization of the sender

    commit f0e737ee3afb3175e43d683d9bb226781aa11108
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 13:25:38 2011 +0100

        - Removed old Components registry
        - Completet an actor as components registry
        - Changes entity creation process

    commit ab74ff175411a9d296e5ea633cb4042e06883af5
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 11:44:22 2011 +0100

        - Authors

    commit 738ea25c46066762c6dd9bc1adb0ec31cdcc9ec2
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 11:34:03 2011 +0100

        - Component Management Actor, Component Handling Trait

    commit da7797188b8dffacbaf54b84edff5fc1ac4ba6ea
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 25 10:42:52 2011 +0100

        - Changes cluster handling trait

    commit 99bdabfa2d8fe2d4f65b329c4d1134bd5059bae9
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 24 16:25:00 2011 +0100

        - Repaired clustering

    commit 8f37382d94e23f722bcec5d5847bdaed1aa9b0da
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 24 16:09:11 2011 +0100

        - Changed the SIRIS Message to save the sender by it self

    commit cea00162d5764d40d040e8377a6eef77ced4147e
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 24 14:48:55 2011 +0100

        - Some serialization experiments

    commit 9b0c9bade28a6937002e22c48435abab55d6a59b
    Merge: 56d7137 ccc8db1
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 24 13:37:49 2011 +0100

        Merge branch 'master' into cluster-integration

        Conflicts:
        	core.iml

    commit 56d713782a1b28d41a884891d033a3ce0a6242b4
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Thu Nov 24 13:36:12 2011 +0100

        - Remote actor creation

    commit ccc8db120bf52088ee8d9e482cce7b68c68b1772
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 24 09:29:25 2011 +0100

        readded gfx aspect to ball

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

        did sth

    commit c6299b9342cd459aa36646a918c08dc83d8d60c7
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 16:45:58 2011 +0100

        - Cluster handling trait

    commit 61e16806ab0097f5caae6aa41754bba487bbfde2
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 16:23:57 2011 +0100

        - Bugfixed subsystem
        - More for the application trait

    commit f591298a21d4ed5b9aef3d5ef62c57f1b3797edc
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 16:09:47 2011 +0100

        - Strucutred the SIRISApplication trait in a more senseful way

    commit 9cb360ddbf9fc2e0532de3cb4978e7e9da595753
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 15:46:42 2011 +0100

        - Some more about clusterin

    commit 07f12b4b24d7ced851e835c5e17847bcb4030143
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 15:08:43 2011 +0100

        - removed deprecated methods from the world interface

    commit 00f6465a7981325b7fa3fb5900eb620bc0938434
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 14:58:49 2011 +0100

        - Some more protected

    commit 448c4db8b897fad1d88822ba2607eb4f1728c112
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 14:56:00 2011 +0100

        - Added some deprecated annotations and settet some methods to protected

    commit 285c490b75ac82ea0acde712f4b3ab9e24843abe
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 14:44:34 2011 +0100

        - Removed more of the continuation stuff

    commit 5cb6c18df2f6c929a9d1bbc9cc4399c322dbe742
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 14:35:37 2011 +0100

        - Minor changes

    commit cdf2bbaad4543f1713e2d7a3c57420d870f37047
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 14:29:06 2011 +0100

        - Some more for clustering
        - removed old continuations get in svar

    commit b4e79cdaffe14ed27e33bc4944b7f3bc51b55caf
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 12:31:58 2011 +0100

        - More about the cluster boot

    commit 48a92827203cd0007a9c5f4423f9a70d87c296fa
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Wed Nov 23 10:47:21 2011 +0100

        - Cluster boot does work

    commit e7e7a3fac2a4c059604568461349af9b5d6a1fc3
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Tue Nov 22 19:10:44 2011 +0100

        - More work on cluster booting

    commit 9890a74e94373f8a1eece5df171c8bd57ef39854
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Tue Nov 22 16:17:54 2011 +0100

        adjusted libnames

    commit 146f86029f847a56ce84f666abdb67995e1a4277
    Merge: fd6eb61 120cac7
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Nov 21 23:00:42 2011 +0100

        Merge branch 'master' into cluster-integration

    commit fd6eb61b9ac952789a525f72749c4f159b37a697
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Nov 21 22:59:18 2011 +0100

        - Some cluster boot code

    commit 120cac703d10168623709600efbb5541dc9b42a9
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 21 17:37:42 2011 +0100

        changed exeception after moving ontology generator

    commit 7710c495da627a2d7a231ba7e426f7ed93febce3
    Merge: dadc533 6ea9465
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 21 17:11:12 2011 +0100

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

    commit dadc53355cfd604ab417be5f5e903c4ca13bc48a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 21 17:05:07 2011 +0100

        moved onotlogy generator to own module

    commit 1b0d2a1f9918c131fce203732bc981e3bc63f055
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Nov 21 17:04:42 2011 +0100

        - Line

    commit 98825ea1f6a38f9b46124c8ca5d1689ad5dece57
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 18 20:44:33 2011 +0100

        - Changes a little bit about the libraries

    commit 571e69efe0394dc2b353114e3551414b60a3f00b
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 18 18:55:52 2011 +0100

        - Moved to AbstractActor

    commit 6ea94654e7580b055da01cb7d7332a0f5b06b05c
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Fri Nov 18 16:50:52 2011 +0100

        - runnable

    commit e70d6d61369fe4bc9484f8e65b3ecfa9a5924057
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 17 14:55:06 2011 +0100

        more on subelements

    commit 770562c7531f31e888cca0458ae0ce9789f93a1f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 17 12:25:27 2011 +0100

        reworked Execute schemes

    commit 1b68cba9ac92d815fa001c5d5bd13ac6b3f191de
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 17 10:41:21 2011 +0100

        reworked Execute schemes

    commit 50dc417a574526be536cc7429443c9799076ef98
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 23:25:29 2011 +0100

        .

    commit 884e5beafe63ac63a1a6ef5f7ca0164a252f2d9a
    Merge: 4128d74 d8b8145
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 23:13:47 2011 +0100

        .

    commit 4128d74ac1e9690008a0f2996890355f3b9cdb6f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 22:06:34 2011 +0100

        fixed-paths

    commit 70df151212851d32e37e01b9f2708f9e9b7a4882
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 21:50:11 2011 +0100

        sbt 0.11.1 now

    commit d8b8145513367b521c81b9d29c73b0677aec21bb
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 13:27:17 2011 +0100

        updated to sbt 0.11.1

    commit 868e6778498f180aed6850067835aebe157af205
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Wed Nov 16 13:26:55 2011 +0100

        updated to sbt 0.11.1

    commit 6c3b65be29ef29643d96a4c859608630b2bf8a69
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 14 17:59:35 2011 +0100

        ...

    commit 92198738b71ccc8924fb15579f9f3fea77acae04
    Merge: 4ec2fba ee8f72f
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Nov 14 15:39:42 2011 +0100

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

    commit 4ec2fbac8834f2090313cc3c49bcf63785e237f8
    Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
    Date:   Mon Nov 14 15:39:23 2011 +0100

        - Commit before branch

    commit ee8f72f59c20de2e071b56214185db8caf372528
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 14 15:06:32 2011 +0100

        .

    commit f3a3c3e7fedd4ce4c1cc3aadccfdced749700642
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Mon Nov 14 15:00:01 2011 +0100

        removed old directories

    commit e2bd4db5357e5ddb235c8c93632c1b7465a37802
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 22:13:02 2011 +0100

        fixed package name  in subelement.scala

    commit 12db09e08cec4b979f08112d93e7064a5927d9ae
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 18:47:33 2011 +0100

        removed wrong deprecation warning

    commit 11057a13a3c2b34fa4796629e13c656826f95943
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 18:44:41 2011 +0100

        final restructurings

    commit fa923ad30a93a5473caeba91cd508d50ecc7c474
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 18:40:54 2011 +0100

        ..

    commit 89f27324947355505ab64f770567f542c0e7894f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 18:38:51 2011 +0100

        restructured src dir

    commit a774998bb223a6fdadaa4225e6ec94bd89e2da68
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 18:02:22 2011 +0100

        moved scala to lib folder

    commit e670a8a30c0e86081fba2129590a0982f5472a46
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 10:16:15 2011 +0100

        git push test

    commit 6e47054f73bba05d454092d6d582b6b116958458
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 10:07:18 2011 +0100

        .

    commit 37bc95d287d595f5e5f8831e598e3b0f60f8e7f1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Sat Nov 12 09:28:03 2011 +0100

        .

    commit 7c8b70f6653b3562cd18921e75270f0fcc5c3f71
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 15:22:03 2011 +0100

        ...

    commit 82c3a550a27ec011f388aa29656a7c6a9cbc21fe
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 15:08:01 2011 +0100

        .

    commit 080cb00ed0fa9e4c6daefdec160503aac1dedd9b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 15:04:53 2011 +0100

        removed target dir

    commit 3834c63e6a982a23d2928b29fdd4aa7d82ca3484
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 14:56:09 2011 +0100

        ...

    commit c73d7f465532896c06e7127173326fe0194f2fda
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 14:54:34 2011 +0100

        added app configs

    commit 3ccf95d786726b32a5d138b981aa3adb11cf0738
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 14:44:51 2011 +0100

        added app configs

    commit 17b84a25e9a05df753a370b93280ad79fe6c317b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 12:08:19 2011 +0100

        .

    commit 2b4e4d3714dd258c3aa87db9c4e12c5c355c16e7
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 12:05:37 2011 +0100

        more settings

    commit 534c98fc9dcbf3a60e406eb64029e549c9b41c83
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 11:32:12 2011 +0100

        more settings

    commit f5208557827710a10b600283e383730d0a006757
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 11:23:14 2011 +0100

        more settings

    commit 1b1660481c31f1a0dc69a5f0465fb2388f893c12
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 11:18:38 2011 +0100

        more settings

    commit bae3badcbf8885a020aa1c386f5ba3aa37f4f8c1
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 10:31:06 2011 +0100

        .

    commit ad655b900e05419127d08adab8fcfc8c3dd7eec8
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 09:46:47 2011 +0100

        	.

    commit 900c5e3f4df3c01dc5fd67b992557fc534d91d2f
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 09:09:48 2011 +0100

        added gitignore

    commit f7fcfef9f46496b1a06d3ba062d6b5a481d0afdf
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Fri Nov 11 09:03:13 2011 +0100

        some changes to sbt

    commit 09b4701682bca947046f95024b5ef05571b996ff
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 16:01:46 2011 +0100

        more settings

    commit 733345a62236bf62938b263fb5c5e0c29d765109
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 15:47:09 2011 +0100

        removed project settings

    commit 4734616bb1d62355ea948cc73839a51919dd27cb
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 14:16:02 2011 +0100

        test

    commit 59084f7ec75a46999caae826485f6a2571e401be
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 14:03:13 2011 +0100

        test

    commit d74684029a759165f84a819d95edfb212dcc974a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 13:57:19 2011 +0100

        test

    commit d389ba39e5e8ff1d427581787ba04956ba0fc666
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 13:56:28 2011 +0100

        test

    commit dbdf5ab2484b0697c94e7428594dd675e6d9453b
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 13:56:06 2011 +0100

        test

    commit e3742b5cd6331a3b4f9d5148c4f7dbeea00a4a3e
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 13:51:56 2011 +0100

        test2

    commit 0be21bbcc3523eec62188e7bef0f6f53c7e65e0a
    Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
    Date:   Thu Nov 10 13:49:16 2011 +0100

        test
updated to current production version
updated to current production version
Merge branch 'master' of win9148.informatik.uni-wuerzburg.de:dennis/simx-core
Merge remote-tracking branch 'origin/master' into github-release

Conflicts:
	.gitignore
	build.sbt
	core.iml
	ivy.xml
	src/simx/core/Configuration.scala
	src/simx/core/SimXApplication.scala
	src/simx/core/SimXClusterApplication.scala
	src/simx/core/clustering/ClusterSubSystem.scala
	src/simx/core/component/Component.scala
	src/simx/core/components/io/IODeviceProvider.scala
	src/simx/core/components/io/IORegistryHandling.scala
	src/simx/core/components/physics/PhysicsComponent.scala
	src/simx/core/components/physics/PhysicsCreateParameter.scala
	src/simx/core/components/renderer/GraphicsComponent.scala
	src/simx/core/components/renderer/createparameter/RendererCreateParameter.scala
	src/simx/core/components/renderer/messages/RendererMessage.scala
	src/simx/core/dynamics/Plan.scala
	src/simx/core/dynamics/Procedure.scala
	src/simx/core/entity/Entity.scala
	src/simx/core/entity/component/EntityConfigLayer.scala
	src/simx/core/entity/component/EntityCreationHandling.scala
	src/simx/core/entity/description/Dependency.scala
	src/simx/core/entity/description/EntityAspect.scala
	src/simx/core/entity/description/EntityConfiguration.scala
	src/simx/core/entity/description/GeneralEntityDescription.scala
	src/simx/core/entity/description/SVal.scala
	src/simx/core/entity/description/SValSet.scala
	src/simx/core/entity/typeconversion/ConversionInfo.scala
	src/simx/core/entity/typeconversion/ConvertedSVar.scala
	src/simx/core/entity/typeconversion/Converter.scala
	src/simx/core/entity/typeconversion/ConvertibleTrait.scala
	src/simx/core/entity/typeconversion/ProvideAndRequire.scala
	src/simx/core/helper/Execute.scala
	src/simx/core/helper/JVMTools.scala
	src/simx/core/helper/SVarUpdateFunctionMap.scala
	src/simx/core/helper/Splash.scala
	src/simx/core/helper/TextureData.scala
	src/simx/core/ontology/EntityDescription.scala
	src/simx/core/ontology/SVarDescription.scala
	src/simx/core/ontology/entities/Entities.scala
	src/simx/core/ontology/entities/Subelement.scala
	src/simx/core/ontology/package.scala
	src/simx/core/ontology/types/NullType.scala
	src/simx/core/ontology/types/TypeDefinitions.scala
	src/simx/core/svaractor/PingableActor.scala
	src/simx/core/svaractor/SVar.scala
	src/simx/core/svaractor/SVarActor.scala
	src/simx/core/svaractor/SVarActorBase.scala
	src/simx/core/svaractor/SVarData.scala
	src/simx/core/svaractor/SVarDataImpl.scala
	src/simx/core/svaractor/SVarImpl.scala
	src/simx/core/svaractor/SVarMessages.scala
	src/simx/core/svaractor/SVarUpdateMap.scala
	src/simx/core/svaractor/handlersupport/HandlerSupport.scala
	src/simx/core/svaractor/handlersupport/HandlerSupportImpl.scala
	src/simx/core/svaractor/synclayer/Cache.scala
	src/simx/core/svaractor/synclayer/SyncGroupHandling.scala
	src/simx/core/svaractor/synclayer/SyncGroupMessages.scala
	src/simx/core/worldinterface/WorldInterfaceActor.scala
	src/simx/core/worldinterface/WorldInterfaceHandling.scala
	src/simx/core/worldinterface/WorldInterfaceMessages.scala
	src/simx/core/worldinterface/eventhandling/EventDescription.scala
	src/simx/core/worldinterface/eventhandling/EventHandler.scala
	src/simx/core/worldinterface/eventhandling/EventHandlerAdding.scala