_
_
Merge branch 'master' of https://github.com/Khaled-Noordin/spring-webflow-samples.git

Conflicts:
	booking-faces/pom.xml
	booking-faces/src/main/resources/META-INF/persistence.xml
	booking-faces/src/main/webapp/WEB-INF/web.xml
	booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
	pom.xml
	primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
	primefaces-showcase/src/main/webapp/index.html
	primefaces-showcase/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css
	webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
	webflow-showcase/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css