Commit
Merge branch 'master' of https://github.com/devplanter/coffeepos into jack

Conflicts:
	coffeepos-ejb/target/classes/META-INF/maven/com.dp.coffee/coffeepos-ejb/pom.properties
	coffeepos-web/target/m2e-wtp/web-resources/META-INF/maven/com.dp.coffee/coffeepos-web/pom.properties
Update product
Merge pull request #9 from devplanter/jack

Update product