maven 3.1 compatibility fix

maven 3.0.5 -> 3.1 broke maven-shade-plugin v2.0
fix is to upgrade to maven-shade-plugin v2.1
Merge branch 'hotfix' into develop