Change by JSON object
Merge branch 'master' into nico
changes in projects
changes in projectCtrl.js and projects.html
Merge branch 'master' into nico
partials changes