create_project controller is ok
solve the conflict
Merge branch 'zwb_dev' into developing