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