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
prevent from sorting the new meta term form
fix input selection issue; update code after db refactoring