Make sure we don't go to the projects page when we just click open/close/delete
Add UI and JS bits for editing project meta data, User Story #14
Merge branch 'upstream/master' into edit_projects

Conflicts:
	index.html
	js/controller/dashboard.js
	js/controller/projectView.js
	js/factories/project.js
	partials/dashboard.html
Fix stuff again after merging
Define versions of dependencies

in order to prevent any future migration conflicts
Merge pull request #36 from tobiasmuecksch/master

Implement canvas saving
Merge pull request #37 from tobiasmuecksch/secondPR

Define versions of dependencies
Resolve conflict between both updateProject methods. Now update users on their own
Merge branch 'upstream/master' into edit_projects

Conflicts:
	js/factories/project.js
Fix some coding style
Merge pull request #35 from boom1992/edit_projects

Edit projects