import: workaround for ImageMagick error-on-warning bug
Admin interface: links "context edit" <-> "key details"
Conflicts:
	app/views/app_admin/contexts/_form.html.haml
Improve session security
SQL Query to find duplicate mkds wrt mks
Refactor preview mechanism
Set session properly in zhdk-auth-contr.; consolidate set_session

Squashed commit of the following:

commit 1b86cc6e99e0e98b32b61cf1f6e4b463087c7f89
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue Aug 19 15:43:21 2014 +0200

    Return user object form zhdk-auth/create_or_update_user

commit 7debd8aff069ad8f6b95242d8c1c9169f0168ba6
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue Aug 19 15:31:41 2014 +0200

    Resolve naming conflict with rails

commit 0db1009a846313c3286ec27f3765aa0868534b3a
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue Aug 19 15:25:02 2014 +0200
Add config/zencoder.yml as default to repo
Fix setting of title image
sass: plupload: fix the delete icon by removing @extend
ui/js: upgrade PDF js lib and integration

Squashed commit of the following:

commit c454c179029a26609b083955058027db6d2deb97
Author: Jonasz Grochowski <tensaioni@gmail.com>
Date:   Wed Aug 20 11:23:02 2014 +0200

    Add missing files

commit 9e239519cf506c072e6d528edd1d57f12fb7843f
Author: Jonasz Grochowski <tensaioni@gmail.com>
Date:   Mon Aug 11 08:24:32 2014 +0200

    Preliminary pdf.js update
UI: merge new styles and specs from IXT

Squashed commit of the following:

commit c99a5444ca5bbcb6a3149bc726d0c8ad4e847408
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Aug 8 12:56:24 2014 +0200

    Fix relationships pointing bottom arrow when scrollbars always visible.

commit ed22b3ec16dc1309ef620ddb4cd312952ca3bcd2
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 15:04:35 2014 +0200

    Update stats module spec throughout.

commit 6fe348899894a0d3f871da4af8e2d6832dd36306
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 12:44:29 2014 +0200

    Cleanup.

commit 79481f49185c8341019252f825034828e2caa65f
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 11:51:21 2014 +0200

    Update thumb up/down items background.

commit c0e523c3dbdca40273b2dfab79be467639655344
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 11:22:14 2014 +0200

    Unify counters.

commit d83b2ca16c978889ecf2b727c4cf7031465f7912
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 09:59:15 2014 +0200

    Bring privacy icons back in horizontal grid resources.

commit 93f20d5a87d4d82002c0898cd4b377d068533d80
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 15 08:52:58 2014 +0200

    Document stats module.

commit f3eb42b284c770c359705de1132c00a73cba67e1
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jul 10 13:51:45 2014 +0200

    Update set icon and icon font to reflect new set thumb style.

commit d9728c82c26fb5c6ca8b1b491c9dbbf9e0b113f5
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 9 11:51:22 2014 +0200

    Cleanup Upc Spec 1.

commit 153ac7f1c1aef09f5fa805b1743ff2122306d4a0
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 18:15:37 2014 +0200

    Fix horizontal tile grid spec.

commit 7b5d0c4f0761954b045ee09cdb500c7f10eca6fe
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 16:50:00 2014 +0200

    Cleanup.

commit e76c744996a0dd25f82ef2aea912b03a77b68e9e
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 16:49:54 2014 +0200

    Move Relationships to Spec 3.

commit d5acc28a673e8845f835e3ed0e404e94ea934cb5
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 16:38:56 2014 +0200

    Add midtone-darker bordered variations. Remove -1px margins from bordered ui-containers.

commit 01837914704486447d5ff204ebd42be736a6ce1b
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 16:38:11 2014 +0200

    Cleanup relationships view with a view stylesheet.

commit 42c674750d8954c1d61f7fe0b9ce951eda6b7e52
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 15:20:52 2014 +0200

    Implement new counters.

commit f9fc157f2651c5b4e45f79b127c1998dd2fbebfe
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 15:20:00 2014 +0200

    Document counters as separate entities.

commit afb6722ae3b8db13c5345639835e6de92547b476
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 15:08:05 2014 +0200

    Stash cleanup Nu Spec 3.

commit 2198b6d3b6329411f56eb4ab80f5d0bf95329fef
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 11:47:47 2014 +0200

    Fix min/max dimension mixin.

commit bc10fa2f8790add815c080f1b63163807dd1e30b
Author: Piotr F <piotr@piotrf.pl>
Date:   Tue Jul 8 11:10:18 2014 +0200

    Tweak set thumb shadows.

commit d59b7c2bf97f0f358304fb68914e4e9590deae32
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jul 3 19:38:21 2014 +0200

    Stash Übergeordnete Sets spec in prep for adding orientation pointers.

commit 5f5b705d56209ec90052ed124a91ed6f6dc7d6ee
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jul 3 18:09:43 2014 +0200

    Stash Horizontal resource grid variation setup.

commit 59e0e7644c712b73864c24c564a77056293059f1
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jul 3 12:03:28 2014 +0200

    Bring back mid corners to level-up and -down items in thumbs.

commit 54b559cea57d4f95f959a2d55d0f84cc2ec827f9
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jul 3 11:03:12 2014 +0200

    Cleanup.

commit 812f3a2f779de0325219f495b376f8e4e415f452
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 15:30:34 2014 +0200

    Setup box model on Upcoming Spec 3 elements.

commit d4bd2745d8c5a27035c9ca9f7acb58d007f9b66f
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 15:30:16 2014 +0200

    Cleanup Upcoming Spec 2.

commit 5ab4cbb5507e359a37cde630a8b03204a1bf0c23
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 14:47:51 2014 +0200

    Update tile sizes to reflect madek image sizes.

commit 9a153b639934632bf1a0d20be198dcf0ee3eb66c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 14:26:22 2014 +0200

    Setup Übergeordnete Sets doc.

commit f7efcad87aee022ad45aa5cbf6b99419df47ee03
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 14:23:39 2014 +0200

    Document a tile set with thumb cover.

commit 678c4491cfefa1bd99a3f01b697d1af7bc1ff77c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 14:12:59 2014 +0200

    Cleanup.

commit 6bc09ad2522658343f5f4dcbf32f163bbe29289f
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 13:25:10 2014 +0200

    Port new set/catalog thumb style throughout. Remove legacy backgrounds.

commit 66ce7ba537fbd7b142f601602d819bc5135264de
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 12:44:54 2014 +0200

    Apply new stack effect to all catalog/set thumbnails.

commit c275cf3ac9c0ef9feedf2cb443830d740ec697c3
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 12:17:40 2014 +0200

    Add tiles :after borders.

commit 51ca3211c2d9dff9d72cd4971f063fbc8876924a
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 12:17:24 2014 +0200

    Remove rounded corners from thumbnails.

commit 815ae091b984a843ce8c99aeda24828bbc6aa637
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 11:37:33 2014 +0200

    Setup Upcoming Spec Three.

commit 65f14b0293fc034b27036696b37d94eeadbca995
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 08:03:58 2014 +0200

    Setup upcoming spec.

commit 288d498d29311a4f2b2c8d3ad38518ccf5fdab49
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jul 2 11:09:13 2014 +0200

    Change icon colour Zusammenhange dropdown.

commit 721436f29eb2c1868a92eec5a4d1a46da006e131
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 23 18:18:31 2014 +0200

    Cleanup.

commit e0d539813183f8cdda1a4bec8eeae7d4bd0672c3
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 23 18:18:25 2014 +0200

    Setup nu spec 2.

commit 36272bb0fbe9462360bc2b41d51899261c3536b1
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 23 18:18:17 2014 +0200

    Update nu spec 1.

commit 83f5aaf90dee5b2600ff654f7f04f589d8972ee4
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 23 11:49:44 2014 +0200

    Revamp tiles spec.

commit eebb1c7cbc1d1fb1b48b8a854dd6da9a92323ecc
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 16 14:24:01 2014 +0200

    Correct Tiles documentation.

commit 2491a477c1ad5fddd549c47833e22d9a04d0fe4c
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 16 12:24:52 2014 +0200

    Move tile actions from foot to head. Revamp fset flag.

commit 1a2ef66ab2066d96491d864e3f8e37957b327e6c
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 16 11:39:14 2014 +0200

    Move tile filterset mark to tile foot.

commit b03639f96dc19d3bd6eb7a74f8d775f99cc83bcf
Author: Piotr F <piotr@piotrf.pl>
Date:   Mon Jun 16 11:24:05 2014 +0200

    Tweak horizontal tiles heights.

commit 080c5958316910ab852c42838e01f65d500ed9d4
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 14:20:50 2014 +0200

    More cleanup.

commit 7136df2651b6edc869665a44272d726230a05abd
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 14:11:30 2014 +0200

    Cleanup.

commit d4174a232eafd9960fc9ec6c1f7daa59a4429ebd
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 13:48:24 2014 +0200

    Stash tile spec.

commit 751b47f13bff55d7df0294ab63c26074d777387a
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 13:47:53 2014 +0200

    Call force scrollbar on specific targets.

    …instead of all elements

commit 6c7a56b91a1dd2db188bc331f34ffa78f8b1ada7
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 13:47:14 2014 +0200

    Cleanup.

commit 9c2efc218913562a30b7f8e5dfb31da6844b37c9
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Jun 12 10:17:30 2014 +0200

    Image optim styleguide images.

commit 5756052c0ca894897ef0ef96f60165134e1e0dcf
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 14:43:41 2014 +0200

    Document tiles in preparation for integration throughout.

commit b5f734eeea84748d719c6a345dec3bc60caf63a6
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 14:27:06 2014 +0200

    Add in opacify mixin.

commit 3121c1e51516768573054be81c5f4a588b9d899c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 14:26:39 2014 +0200

    Rename black and white colour variables.

commit 9e1de1d8a1a0c161eb229f034f6ff3d4bc3d6c6c
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 13:55:48 2014 +0200

    Add in new lib mixins.

commit 1cfd296c85a1267660261379e135b190a23f628b
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 08:58:39 2014 +0200

    Update icon font. Document .icon-vis-pins icon.

commit fb91b86086378b0b32112fe2a4a108ada69e6be2
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Jun 11 08:03:58 2014 +0200

    Setup upcoming spec.
css: remove 'overflow: hidden' from '.ui-container.rounded'
styleguide: add href to all links
ui: implement new action bar for Entries and Sets
move login_action to top navigation
resources: actions menu: move up 'organize'
resources: actions menu: adressen without 'verwalten'