Merge pull request #156 from hazendaz/master

[release] build cleanup
[maven-release-plugin] prepare release waffle-demo-parent-1.7