Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop