changes

changes on project controller and project_detail2_edit view
Merge pull request #114 from camilin87/master

Merge last changes to my branch
Merge pull request #115 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch