editTemplate and minor Changes in ProjectController
Merge branch 'master' into searchConstruction