Revert "Revert "Merge branch 'master' of github.com:clubbdINSAdev/appli2.0""

This reverts commit 4ff6dfb57464d123a29a11f60656df8bf3d6a3e6.

Re-revert to get all ember-data changes back...