Squashed commit of the following:

commit 1ab36fbc9d8104730b1b6e0636c961e63a0be79a
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:56:12 2012 +0100

    fix errors

commit 6ccd3150b4b3fd9cba758ecc7e9137035071825a
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:45:47 2012 +0100

    add method that checks if userUri is a sioc:UserAccount, change subscription statement from foaf:Person to sioc:UserAccount

commit a60ea3a9405f3d4df80fd8d4ce24d81d9e6ddeee
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:42:15 2012 +0100

    fix some errors

commit f671ff75bebe172d65ee34e384c75d7404639dfb
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:40:48 2012 +0100

    add error logging

commit 42246c491bee98f014ac4a84e28371db06620ca3
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:39:45 2012 +0100

    add foaf:Account <userAccountUri>

commit 64e574a836493220e4c8d31f04d51d19f13b6336
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Nov 14 14:37:15 2012 +0100

    change ns of non given uri to baseUri()

commit 7f298e8ccd07a40f50b301359c95308314c3a2a2
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Nov 13 22:43:00 2012 +0100

    delete unused function

commit 5e1d3300fe2280f19f77b81d65debaf0275a08c2
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Nov 13 22:35:53 2012 +0100

    fix errors

commit cde848209d6025e2ca578b6d90982b23ca950092
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Nov 13 22:31:00 2012 +0100

    fix errors

commit bed3e2d4c56761bea763606ae342d52a1d202b6c
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Nov 13 22:18:46 2012 +0100

    remove SQL statements and therefore use SPARQL and (multiple)Statements of Erufrt_Model instead

commit 5cc1d89059c54f54cc453bfc660d755b666c5dc3
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Nov 13 20:01:01 2012 +0100

    clean up

commit 288dc62120fddbdf4c5cce9e835b23689487ad11
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:23:07 2012 +0100

    minor change to view of activities and resources

commit 570181bb674c6323a37fa2be9cbd33b43b9a841f
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:22:12 2012 +0100

    fix htmlentitites problem

commit 45093d1835d05b449b03365e670d4c318ab182f0
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:21:15 2012 +0100

    add <false> as a return value

commit 593c8d0230f6f4725d17b66ed83e79ed36c3391a
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:18:13 2012 +0100

    adjust used methods to xodx, first ping test succesfull

commit e9499862b2c7cd5cf909940a0e04d46b1bec11b7
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:15:31 2012 +0100

    change behaviour/usage of NameHelper

commit 31b6f39687d4751dcfde6acb6ff2d754745d4e8b
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:12:33 2012 +0100

    cleaning up code and fix problem with getting activites

commit 2655b8bd88b576acbd0b1826588d0f04f3ac68d9
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Nov 12 14:10:10 2012 +0100

    add some more cases for getting spoken word

commit 6828ca76fc09cfdc636fa58052e7f6bbac019ad2
Merge: 2db9327 26e8116
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 15:10:23 2012 +0100

    forward submodule

commit 2db9327d73945353f9b1cc83e103adebc7a66ef6
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 15:02:52 2012 +0100

    minor changes to activity form

commit 6f88e99efa68503c9ed9a746dde124c77e978a6d
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 15:01:32 2012 +0100

    forward submodule Erfurt

commit 29dcb76c265d3d2eee078c29ceaf6df5307af2ae
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 15:00:54 2012 +0100

    add path and namespace of ARC2

commit 7d4abab1cdf0abf8f52b6ac1820eb232db4b57a3
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 15:00:21 2012 +0100

    add code from OntoWiki Pingback Extension - a lot TODO

commit 23a24613dd0b8ed714099a9d529a2bb83dd95105
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Nov 8 14:59:18 2012 +0100

    cleaning up code

commit 26e8116f7e3801502e6a96cd5d8efcc63420a799
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Tue Nov 6 20:00:34 2012 +0100

    enhance Makefile

commit cf3d968de637daec9167e9de9ad217d4ea949a90
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Tue Nov 6 18:58:38 2012 +0100

    forward Erfurt submodule

commit d8171b2a1dd5daf867726ab022ee3652d8e5a60e
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Tue Nov 6 18:44:52 2012 +0100

    use new getModelOrCreate method

commit 6c32690862c325622380ac36442f95b001bc2240
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 21:57:27 2012 +0100

    hope the Makefile is correct now

commit f7c499998ab05995aaedbd63d121771589f2a981
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 21:55:03 2012 +0100

    fix typo

commit 9fc9bca477f8c34d68420a5a38b6084e6d788ad7
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 21:51:34 2012 +0100

    add option to download submodules from zip and some more stuff

commit fa38adcb8ca5ea3a1ba06dc429b215daf1316b49
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 21:37:29 2012 +0100

    add more options to Makefile

commit c15a2da6381723cd7d365f9a71725904b95f2ca9
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 21:03:34 2012 +0100

    create jquery directory if missing

commit b8681a2dad8dee8d41eccd0823f8935262d52760
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 20:51:43 2012 +0100

    add php doc to Bootstrap

commit a8c4b385c23fe40599bb9847403e127267b46a23
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 20:39:47 2012 +0100

    remove unused properties in Bootstrap

commit a72c9305edb5b2e48ad6a3d59c54fb713d5531b2
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Nov 5 20:32:44 2012 +0100

    add model and table initialization for Erfurt

commit 0600d09ba082d741038ee2a67c37933c9db6a65d
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:35:36 2012 +0100

    make layout responsive (usable for mobile)

commit 7b13f9a45358bc378e0555c0fa765fd720767631
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:26:44 2012 +0100

    inverte tavbar again

commit 90b1ea645af7a9740313d267622555d7776b4969
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:20:15 2012 +0100

    change comment in ActivityController

commit 9fbf2879cbe37f5b1ee1216e2723cc7b12e1d410
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:19:17 2012 +0100

    throw exception if pinging non RDF target

commit 1c3bdb0d994c8e1e0638916b2f7f4abe3f2c7d51
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:18:03 2012 +0100

    set dssn constants in index

commit f2e8d44a3e89cae3f4ef5a4bb872e1415accfdeb
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:17:16 2012 +0100

    forward Erfurt submodule

commit 14f2071798475740e6a6cf9e6b5b9ca613fb11c4
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:17:05 2012 +0100

    forward dssn submodule

commit ca545db42d42f4a2deeb951668efc4646d663810
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Wed Oct 31 11:15:20 2012 +0100

    add Makefile which gets jquery and bootstrap

commit 258b30f7f8937f53270dc8ef19f1e25260dd0d1b
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Oct 30 13:19:41 2012 +0100

    add functionality to get rdf:type of source pinging us

commit e0d89571dac8ea282939367e729c5c00f8175d02
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Oct 30 13:18:09 2012 +0100

    forward submodule lib-dssn-php

commit b531ec27a95532d3929d027b52968194eff02d29
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Oct 30 13:11:10 2012 +0100

    add functionality to import activities out of pushed feed entries

commit a48c307c3b6d022cb76c3f4ccc0b23b0552b3e77
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Oct 29 20:13:06 2012 +0100

    little change to make previous commit work

commit e9312198eacf9fec94d6185d10b013ee337147ce
Merge: 8fbf0df f49db44
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Oct 29 12:10:42 2012 -0700

    Merge pull request #1 from white-gecko/patch-1

    Fix Activity Query remove unused stuff

commit f49db4402ca221d62ca7b55051d1cbe72fc1b62d
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Mon Oct 29 20:05:22 2012 +0100

    Fix Activity Query remove unused stuff

commit 8fbf0df037dd8a760b30efa462dff9b52ba4603a
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 29 19:47:04 2012 +0100

    change order statement in sparql query to quick fix an erfurt problem

commit 92c203229f3326b0a36a7df24b3cfbe28e6836d0
Merge: ef0fd4e 8287d7f
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 29 19:41:15 2012 +0100

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 8287d7fb495d6676f9020601189c2d489ca53667
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Oct 29 19:39:51 2012 +0100

    forward submodule Erfurt

commit ef0fd4e020ed63ead03b730b17764daab8866ac3
Merge: 0d96ef2 8957def
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 29 14:30:49 2012 +0100

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 8957def0613f0b69ebd276af258ac85eece4c3c9
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Oct 29 14:28:55 2012 +0100

    forward lib-dssn

commit 9da4bc0a86a06e5f5af990dcbe7ddba75b3a5981
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Tue Oct 23 13:40:10 2012 +0200

    merge with master and aksw/lib-dssn-php

commit 0d96ef240a389cb4154bce0e8975822c514af647
Merge: c51501c 31ff462
Author: Norman <splatte@comiles.eu>
Date:   Thu Oct 18 11:38:26 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 31ff462c861997649cc9709774dbe517ac598374
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Oct 18 11:16:41 2012 +0200

    forward lib-dssn

commit d5feed8d5dacef5cd6cd197e972c3c9062c37e8a
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Oct 18 11:16:19 2012 +0200

    add test method

commit 81fb608b5c07b69b202656725d0b32f11ce71d96
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Thu Oct 18 11:14:33 2012 +0200

    add activityContext to SPARQL Query

commit c51501c98f751cf8ed46210246851fb9f6527963
Merge: 0a94d86 f606074
Author: Norman <splatte@comiles.eu>
Date:   Wed Oct 17 13:20:36 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit f60607424cfc8744249d1890203fcc5b3e6397ef
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Wed Oct 17 13:17:15 2012 +0200

    add activityContext/activity:target to classes working handling feeds and activities

commit b38416a057a690f748221fa2dfdfe1d049e8a1e9
Merge: f7fa50b f86f9ef
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Mon Oct 15 19:33:32 2012 +0200

    commit after merging with white-gecko/develop and updating Erfurt & lib-dssn

commit f86f9ef8399d15728d4e556f8faf78f205fb962d
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Sat Oct 13 22:08:57 2012 +0200

    update README

commit e1e9b15fea9089500dd9c132ac997bb4b4a15d01
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Sat Oct 13 22:00:29 2012 +0200

    Patch #1 for 'Squashed commit of splattater/develop'

commit bb6e19e9edfb39122de2ebc1c09a1af716e2caf4
Author: Norman Radtke <norman.radtke@gmail.com>
Date:   Sat Oct 13 13:23:57 2012 +0200

    Squashed commit of splattater/develop

commit fdb9c19100010eaa6ae7cdd4d39b1d5677da41b8
Author: Natanael Arndt <arndtn@gmail.com>
Date:   Sat Oct 13 12:33:14 2012 +0200

    Forward Erfurt submodule

commit 0a94d86a6632af67903ac6ca0885ad2e0b881f69
Merge: 9132adf 3fffa2b
Author: Norman <splatte@comiles.eu>
Date:   Wed Oct 10 00:13:22 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 9132adf9521c3fb30ad6657803da798dc7876087
Merge: 18150c9 b264666
Author: Norman <splatte@comiles.eu>
Date:   Wed Oct 10 00:09:47 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 18150c9a2e02d76352d1fbf0ba0a05e50ab68941
Merge: 538beb2 3271e3d
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 22:52:50 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 538beb20d923a32e7488b574acd77bb9585f38bf
Merge: 2e369e8 9172d70
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 21:55:12 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 2e369e8aed8f5fdc6259be4ce15aaa6f27626855
Merge: c22470b 2628636
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 13:51:36 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit c22470be81be75ac7a4aa56321acc77651009f70
Merge: 6b347bf 8ccb58d
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 13:07:25 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 6b347bf45257d5328139b5ee8e97b51230f5752d
Merge: 1a5e477 a1155fc
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 12:54:53 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 1a5e47788d40fb4c54d8446e8188aeb44b9cd79e
Merge: 3694e1d 2871170
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 12:37:57 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 3694e1ded656cdd0ae0241e6fd61de3bbe0c957b
Merge: 532b163 e443ab4
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 12:12:28 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 532b163eaba8becada5eb36c967fdbb19aa10f37
Merge: 4bb5cef 0742b76
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 11:12:30 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 4bb5cef3f830833dd9a473b6467791306f9dfa0c
Merge: 877a779 4009fd6
Author: Norman <splatte@comiles.eu>
Date:   Tue Oct 9 10:07:42 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 877a7790d1c3b5f6e251414aa6b2b886170afcf7
Merge: 8b899ad e990538
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 8 22:36:57 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 8b899ad39e0f3d18fca23f0cdc3ad7f9636c5613
Merge: 12a97d3 4ad862b
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 8 22:11:29 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 12a97d37eccead5cbd17f583d4b73cced943251f
Merge: a134961 b6c5f97
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 8 21:13:44 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit a1349610d027c5970fdcf920f7942e8067880182
Merge: c009954 87bf712
Author: Norman <splatte@comiles.eu>
Date:   Mon Oct 1 10:03:38 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit c0099548a4bc4dc8e884cdb7e2f918ab42d05637
Merge: 63f4291 b8e1f6c
Author: Norman <splatte@comiles.eu>
Date:   Sun Sep 30 21:55:27 2012 +0200

    Merge branch 'master' into develop

commit b8e1f6c005ddeb093fe6ca271455f7f0c4bd63fd
Merge: 1bdaeeb 1080a40
Author: Norman <splatte@comiles.eu>
Date:   Sun Sep 30 21:54:59 2012 +0200

    Merge branch 'master' of git://github.com/white-gecko/xodx

commit 63f429146bbd998fccdcc84d65cbbc736382aee8
Merge: 9acdc1c 0d65d48
Author: Norman <splatte@comiles.eu>
Date:   Sun Sep 30 21:23:53 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 9acdc1c6417c75e4e6e85e1430c5c6f7fae9ad05
Merge: 54227fd 9dbf7b8
Author: Norman <splatte@comiles.eu>
Date:   Sun Sep 30 20:23:41 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 54227fd2585ed24b1aeecaa9c832ec730c0350f4
Merge: 4779856 6bb6a54
Author: Norman <splatte@comiles.eu>
Date:   Thu Sep 27 17:15:04 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 4779856acc35763314a63f75b663bcd20625f765
Merge: 4582e91 b872203
Author: Norman <splatte@comiles.eu>
Date:   Wed Sep 26 16:29:36 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 4582e912a709bfc4c7d34164af1e19338e101dcd
Merge: 873a6f6 1e41bf9
Author: Norman <splatte@comiles.eu>
Date:   Wed Sep 26 15:23:44 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 873a6f64c9bb645b3a82c4a35d4c029010f25f25
Merge: 3c0bc41 b343d47
Author: Norman <splatte@comiles.eu>
Date:   Wed Sep 26 15:08:05 2012 +0200

    Merge branch 'develop' of git@github.com:splattater/xodx into develop

commit 3c0bc417c5f1db516f7025c74b8fa4e86480cc0e
Merge: 2120a24 1bdaeeb
Author: Norman <splatte@comiles.eu>
Date:   Tue Sep 25 10:28:01 2012 +0200

    Merge branch 'master' into develop

commit 1bdaeeb8752eb8188b6050cc9717087e3b038053
Merge: 418feaa f603fb3
Author: Norman <splatte@comiles.eu>
Date:   Tue Sep 25 10:27:42 2012 +0200

    Merge branch 'master' of git://github.com/white-gecko/xodx