[FIX CI] squash merge of mk_fix_ci branch (some CI fixes)

Squashed commit of the following:

commit 03ec7f638f27e3fc22658f3a8a2f770fee9b83e5
Merge: 8ded822 39e6745
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Jun 19 14:03:02 2014 +0200

    Merge branch 'master' into mk_fix_ci

commit 8ded822d4b3326de7d6407ec0a726d467e4d56f9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 11 12:23:30 2014 +0200

    fix ci: features/examples/kalender.feature:14

commit 708a1f3097869b06eec0ea0cafe18ac4951db863
Merge: b841bb5 b54ebcd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 11 10:04:00 2014 +0200

    Merge branch 'master' into mk_fix_ci

commit b841bb5f47c388b7ebde134ce5a2026a712003bc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Jun 10 17:17:59 2014 +0200

    fix ci