Harry: changes to edit Order
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject.git into dev