Upgrade shade plugin to version 2.1 to allow also to build the project with Maven 3.1
Merge https://github.com/aheritier/restangular into aheritier-restx

y,