Implement canvas saving
Merge remote-tracking branch 'upstream/master'
Define versions of dependencies

in order to prevent any future migration conflicts
Implement canvas layer-index manipulation
Merge pull request #36 from tobiasmuecksch/master

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

Define versions of dependencies
Merge branch 'upstream/master' into edit_projects

Conflicts:
	js/factories/project.js