small changes to project controller
Merge branch 'develop_2' into develop