Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Thu, 27 Aug 2015 11:04:41 +0000 (13:04 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Thu, 27 Aug 2015 11:04:41 +0000 (13:04 +0200)

Trivial merge