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
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
prepare routes and tab-navigation
import raw html from styleguide for mockup
more structuring: controller method, partials
more structuring: tab navigation, partials also for media_sets
throw out static mockup, build with haml and data. cleanup unused templates.