Fixed install clash
Merge branch 'gantt' into develop