Merge branch 'master' of https://github.com/themoffster/java-design-patterns into themoffster-master

Conflicts:
	dao/pom.xml