Merge branch 'Ideas_daniel' into editing
Merge branch 'editing' into Pre-Master