Update maven-shade-plugin to 2.1, fixes a compile errer
Merge remote-tracking branch 'lamp_git/fourth' into fourth