Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'
Merge pull request #46 from arnaudbey/master

 	hotfix mergeconflict
Merge remote-tracking branch 'upstream/master'
Adding name and description attributes in AbstractWorkspace entity and
creating ABstractRessource and ConcreteRessource entities
Merge pull request #47 from ALouis38/entities

Adding name and description attributes in AbstractWorkspace entity and
Merge remote-tracking branch 'upstream/master'
Cleanup
Fixed cp
Merge pull request #48 from purplefish32/cleanup

Cleanup
Merge remote-tracking branch 'upstream/master'