Show media_entry when it has a custom url #master-hot-fixes #FIX

Conflicts:
	config/deploy/stable_version.rb
Reset session when corresponding user is not found #master-hot-fixes #FIX

Try to avoid endless loop
robots.txt: disallow indexing of styleguide
Remove render call (hack on top of hack, ...) #FIX

This is a patch on top of a larger problem. It redirects
to the login page when a set is requested without permissions.
clean up meta terms after db refactoring
Update stored schema
assets: move default zhdk logo from /app/assets to /public as per current version of sprockets

This was a change in Rails 4, see <https://github.com/rails/sprockets-rails/blob/94a033289ba895c036b73527ca5e567d88a35e58/README.md#changes-from-rails-3x>
> "Only compiles digest filenames. Static non-digest assets should simply live in public/."
Fixed README
Update db/structure.sql (PG 9.3)
Set eager_trials and increase auto_trials for frequently failing filter_set tests
Reload table definition during migration
Cleanup and more readable code for MetaTerm and Keyword model

Remove submodule to see where it fails

Clarification and cleanup in the Keyword model

....argh ...

Reformatting meta term

finalize cleanup
Add (preliminary) queries to count meta_terms from a meta_context
Add as count to meta_terms_with_non_zero_count in meta_context
Group meta_terms count also by meta_key_definition
New vocabulary builder for context

commit d518e0a9858c22e534c39e155da0e03d608357a2
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 14 09:31:56 2014 +0200

    Complete test and use consistently symbols everywhere

commit 2fa1821e8c64439e31d506a2563770637be5088d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 14 09:10:49 2014 +0200

    New test for building vocabulary ... tbc

commit f8f08e90277b55172598de09391f3c5a07492b00
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 14 08:42:27 2014 +0200

    More readable code

commit 6818196b621885c78e557cf23c7b0f59e8afd505
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 14 08:39:51 2014 +0200

    Extracted vocabulary query and modularized it
gems: update newrelic gem
Gemfile: upgrade font-awesome-sass to a version that actually exists
Meta-keys in the admin interface

Squashed commit of the following:

commit b48534c881a066690957f4c78549cb034cb07c53
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon May 12 08:00:27 2014 +0200

    [admin] show metakey contexts; ability to filter list

commit faf2459753801671e769b880a6d24ed0476dd2ed
Author: Max F. Albrecht <1@178.is>
Date:   Thu May 15 19:53:02 2014 +0200

    Gemfile: upgrade font-awesome-sass to a version that actually exists

commit 2606d58f46c585b09457315ce099ef18f4b9edc8
Author: Max F. Albrecht <1@178.is>
Date:   Wed May 14 17:33:22 2014 +0200

    gems: update newrelic gem

commit 6ef320d36967ff79f433bc1a537c886632ba8f51
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 14 10:13:58 2014 +0200

    New vocabulary builder for context

    commit d518e0a9858c22e534c39e155da0e03d608357a2
    Author: Thomas Schank <DrTom@schank.ch>
    Date:   Wed May 14 09:31:56 2014 +0200

        Complete test and use consistently symbols everywhere

    commit 2fa1821e8c64439e31d506a2563770637be5088d
    Author: Thomas Schank <DrTom@schank.ch>
    Date:   Wed May 14 09:10:49 2014 +0200

        New test for building vocabulary ... tbc

    commit f8f08e90277b55172598de09391f3c5a07492b00
    Author: Thomas Schank <DrTom@schank.ch>
    Date:   Wed May 14 08:42:27 2014 +0200

        More readable code

    commit 6818196b621885c78e557cf23c7b0f59e8afd505
    Author: Thomas Schank <DrTom@schank.ch>
    Date:   Wed May 14 08:39:51 2014 +0200

        Extracted vocabulary query and modularized it

commit 8944fd38135434e5d59d5a3be05744f6966b7843
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 13 13:07:59 2014 +0200

    Group meta_terms count also by meta_key_definition

commit 83a06668688ae6248a292d3fcf5b2330df876fa3
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 13 11:25:42 2014 +0200

    Add as count to meta_terms_with_non_zero_count in meta_context

commit 18053baf00a9dfc7daa9e77e0108752b1897949e
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 13 11:14:58 2014 +0200

    Add (preliminary) queries to count meta_terms from a meta_context

commit c6844f248fab08203efc160a5ef778d6cbc10e6d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 13 09:05:53 2014 +0200

    Cleanup and more readable code for MetaTerm and Keyword model

    Remove submodule to see where it fails

    Clarification and cleanup in the Keyword model

    ....argh ...

    Reformatting meta term

    finalize cleanup

commit 1afa660aa50310c1c90a4d970fc8311607de5ffe
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon May 12 11:39:58 2014 +0200

    Reload table definition during migration

commit 7cb18609deff91aa5a11b5200fcfbb2c92623a4d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon May 12 11:39:33 2014 +0200

    Set eager_trials and increase auto_trials for frequently failing filter_set tests

commit 0a14d7bbf325ebb7c0d6ecfaebbd561473b52425
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon May 12 11:38:28 2014 +0200

    Update db/structure.sql (PG 9.3)

commit ee4b0faac2664cafb5ce66bfe60b65b32024ab4a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon May 12 11:17:25 2014 +0200

    Fixed README

commit 156520d8fd6a8834e328199bb7e2c7e6b67de703
Author: Max F. Albrecht <1@178.is>
Date:   Fri May 9 14:03:08 2014 +0200

    assets: move default zhdk logo from /app/assets to /public as per current version of sprockets

    This was a change in Rails 4, see <https://github.com/rails/sprockets-rails/blob/94a033289ba895c036b73527ca5e567d88a35e58/README.md#changes-from-rails-3x>
    > "Only compiles digest filenames. Static non-digest assets should simply live in public/."

commit e42134d9cc1027a6ba437c489cc5e11a3be210b5
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu May 8 19:17:00 2014 +0200

    Update stored schema

commit f9eea2280c669408ce02b8b32844ac80ce926d66
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu May 8 13:42:53 2014 +0200

    Remove render call (hack on top of hack, ...) #FIX

    This is a patch on top of a larger problem. It redirects
    to the login page when a set is requested without permissions.

commit 77bb063840289bd1e3c8cb1cfc1fe9d6f9164e01
Author: Max F. Albrecht <1@178.is>
Date:   Thu May 8 11:53:15 2014 +0200

    robots.txt: disallow indexing of styleguide

commit 9efa4d2aad433cf14defd8027e4327d4cc4b6bdb
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 7 15:25:42 2014 +0200

    Reset session when corresponding user is not found #master-hot-fixes #FIX

    Try to avoid endless loop

commit a0229dfa745133c725761e84d37a54800aca062d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed May 7 13:33:05 2014 +0200

    Show media_entry when it has a custom url #master-hot-fixes #FIX

    Conflicts:
    	config/deploy/stable_version.rb

commit 06e37033f0dd90d7d27d6bf4b09ca0cb65a0938c
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Tue Apr 15 14:34:27 2014 +0200

    [admin] fix known meta terms issues

commit ed7e6d422d5b6723f0e25c3633079019bf7079b8
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Wed May 7 10:15:02 2014 +0200

    clean up meta terms after db refactoring
Extract shared rspec feature functions