TENGO MIEDO ;;
Merge branch 'master' of https://github.com/kotick/Whisky

Conflicts:
	.gitignore
	Whisky-ejb/build/classes/META-INF/persistence.xml
	Whisky-ejb/dist/Whisky-ejb.jar
	Whisky-ejb/nbproject/private/private.properties
	Whisky-ejb/setup/glassfish-resources.xml
	Whisky-ejb/src/conf/persistence.xml
	Whisky-web/build/web/WEB-INF/classes/managedBeans/HomeMB.class
	Whisky-web/dist/Whisky-web.war
	Whisky-web/nbproject/private/private.properties
	Whisky-web/src/java/managedBeans/HomeMB.java
	build/Whisky-ejb.jar
	build/Whisky-web.war
	dist/Whisky.ear
	dist/gfdeploy/Whisky/Whisky-ejb_jar/META-INF/persistence.xml
	dist/gfdeploy/Whisky/Whisky-web_war/WEB-INF/classes/managedBeans/HomeMB.class
	nbproject/private/private.properties