Introduce KeywordTerm and separate Keywords and MetaTerms
Migrate labels etc directly into MetaContext and MetaKeyDefinition

Squashed commit of the following:

commit 81b7960d5f792b27d0594860de84732870292d82
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 13:25:24 2014 +0200

    Update docu

commit 02065af20d207b1a1863ca20ceed7ec12b30fcc3
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 13:20:00 2014 +0200

    Update docs

commit 349a5610f134483b209894e67db5cfb0924514d0
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 13:12:36 2014 +0200

    ... fix

commit 81baa053b2b41acc2a7ed9e2d24d6dafbf0b34a3
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 12:38:33 2014 +0200

    ... fix

commit f611388c666269f2c918235e707583948b279cbe
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 12:19:02 2014 +0200

     ... fix

commit fc97304a0d487059329e80a0398e57db1e3598f1
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 12:11:27 2014 +0200

    ... fix meta context factory

commit dd3516cabd827f594edba3c6150cb13486bf59fd
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 11:00:39 2014 +0200

    DB refactoring move labels ...
Refactor, migrate and clean meta_terms table

Squashed commit of the following:

commit 6505dd09bb52cb6ed80f2f6708287a9a104e428f
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 18:37:33 2014 +0200

     ... change a few types ...

commit 80e761f3cf62ae55b5fcde75c5e89df80e06071d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 17:38:31 2014 +0200

     ... maybe  ...

commit c438b3ef8ef09d4c87a2bb4654871882c03b281a
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 17:30:34 2014 +0200

     ...

commit 292cd4740ac7467bc998cd5329d78d67e5465cd4
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 17:03:13 2014 +0200

    ... fix creation of meta_term through meta data

commit 2dcbcc685b2df7aa4b827768c40898dad2256bbd
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 16:18:11 2014 +0200

     fix the to json query

commit 8e586a4d85629a37928769a327f8e344b3d6be99
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 16:12:26 2014 +0200

    fix factory

commit 1def4b917bb114d0c326ad8e48f4b27bac2b0237
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 16:10:08 2014 +0200

    ... Minor structural changes

commit 5dd6caf00224012bbecf1d776d591a2e865aa5f9
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 16:01:59 2014 +0200

     ...

commit b96b4c1fbdb5ec97fe2cb5e89c61fc4a5613b75c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Apr 30 15:38:49 2014 +0200

    Refactoring meta_terms table
Disable data query causing problems on productive data
Update doc/diagrams/Schema and db/structure
Set stable version to 2.0.3
Support for Cider-CI

Squashed commit of the following:

commit 14b7e417883a34ce764a123bf3b48f29d3df8b7c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 11:19:01 2014 +0200

    minor update

commit 160895cafdaa0c65674d65c976408d52771f53d6
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 11:01:40 2014 +0200

    fix semantics of specification

commit 8fb6d40c70791274d53b42442134d78fbd798192
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 10:59:24 2014 +0200

    Completeness ...

commit 2dafbdf8838e664f10568fee101458f8b7e7ecc8
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 10:22:02 2014 +0200

    File name fix

commit 92a361986a7dbcfc9e7936fa55d9051f3b271609
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 10:11:47 2014 +0200

    now all_tests

commit a292523c49a2ec8e17354a7751685c5f4f96c4f1
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 09:40:54 2014 +0200

    Running a feature too

commit 1879de96c5e3c565af4243751790bea948c53a6b
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 09:33:04 2014 +0200

    db ajustments

commit befe8eb0c4f8dde462fdc3724d469657182f8534
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 08:55:17 2014 +0200

    Initial CIDER-CI setup
Improve Cider-CI support, remove Domina-CI support

Squashed commit of the following:

commit cffe835b38c529c6621daaea14710303afd21aa4
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 14:23:37 2014 +0200

    fix completeness

commit 68243051991afddd3120d7a477f30016e01b52f7
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 14:16:28 2014 +0200

    Remove domina ci support

commit 31c15180b04a092e92830a260746caf76b18f16a
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 14:15:29 2014 +0200

    Fix hotspots

commit 727e2df0376f145177ff3dcfd9e09baaea344817
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 14:09:33 2014 +0200

    fix ...

commit b00c51738228f0448e58bfc933eb394f15fab82c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue May 6 14:07:24 2014 +0200

    dryness
Remove TODO_features and other legacy files #CLEANUP
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