update/fix owncloud.org/contact
add a link to third party apps integrating in oc. That page needs improvements - I plan on working on it during the conference.
make sure page doesn't claim the release is coming
Merge pull request #270 from owncloud/conference

add link so ppl know where to submit talks
Merge pull request #271 from owncloud/features

make sure page doesn't claim the release is coming
Merge pull request #257 from owncloud/contact

update/fix owncloud.org/contact
Squashed commit of the following:

commit da358fa750cd779f22f3cb7be1b826b965d5bf66
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:13:22 2014 +0100

    Make links in alert boxes more obvious

commit b625d022806a0bf0d579a7e953e55b96f3357f7a
Author: Jos Poortvliet <jospoortvliet@gmail.com>
Date:   Thu Aug 14 16:35:40 2014 +0200

    update mozilla logo

commit cd58b422f04c2ccd774456e027d7ceb112022d2b
Author: Jos Poortvliet <jospoortvliet@gmail.com>
Date:   Thu Aug 14 15:19:22 2014 +0200

    make sure page doesn't claim the release is coming

commit cfbdd9fa30c1bf16df60e5edc00cebf1bc163d39
Author: Jos Poortvliet <jospoortvliet@gmail.com>
Date:   Thu Aug 14 13:30:05 2014 +0200

    add mozilla foundation to conf partners

commit 46971b34c6e586990af1d797b2131879a94bbfbc
Author: Jos Poortvliet <jospoortvliet@gmail.com>
Date:   Wed Aug 13 19:04:25 2014 +0200

    add link so ppl know where to submit talks

commit 2fda30db38629cda50aae686dc86ef1e338189d1
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 13:38:59 2014 +0100

    Fix next page link and show if no infinite scroll

commit 473a23d7df7de786530e779dcdcfa206411cb3b6
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 13:24:29 2014 +0100

    Use opensource icon on homepage

commit 08497c6bc9cebfab1246d9dee6176c0fca0cbcbc
Author: Jos Poortvliet <jospoortvliet@gmail.com>
Date:   Sun Aug 3 17:50:20 2014 +0200

    update/fix owncloud.org/contact

commit a8aa45be5ae7a82dc1d26068493eb966c625199d
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:13:30 2014 +0100

    Fix some indentation

commit df80bbdf91cac67906841d523bba6f62bf2c24f6
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:13:22 2014 +0100

    Make links in alert boxes more obvious

commit c782b838db90e28e8bea9a8ed14d6ec47bb95955
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:08:02 2014 +0100

    Add new provider

commit 05f22da8ec4e542db5763f21de0b5366eacfabb7
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:04:54 2014 +0100

    Update provide logo and link

commit 63df4658fd5c2f3f09b057b7321b2fda2ab36e54
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:04:29 2014 +0100

    Add new provider

commit 7121d20a27cfae9739506bc1c60ebad6b64c95b3
Author: Tom Needham <tom@owncloud.com>
Date:   Fri Aug 8 23:01:02 2014 +0100

    Add some flags to provider
Merge pull request #269 from owncloud/linktoapps

add a link to third party apps integrating in oc.
Merge pull request #274 from owncloud/conference

add Freiheit Statt Angst logo to conf site
Add new provider
Merge pull request #276 from owncloud/provider

Add new provider
add link to code of conduct and conf program blog