Merge pull request #170 from pnicolucci/UpdateMavenAssemblyPlugin

Update maven-assembly-plugin to version 2.5.4