modified project controller to add search function
Merge remote-tracking branch 'origin/master' into laura
Double layouts working