Commit from JBoss Tools
Commit from JBoss Tools
Merge branch 'master' of https://github.com/hoatnghi/app.git

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/webapp/WEB-INF/spring-quickstart-ds.xml