popovers for project
conflict from deji merge resolved
merge conflicts from contoller resolved
gantt fix
gantt merge conflict resolved from deji
Merge branch 'feature/ganttfix' into develop
Merge branch 'develop' of https://github.com/dejijaye/Calendarize into develop