update
Merge branch 'master' of https://github.com/hantsy/ee7-sandbox

Conflicts:
	common/src/main/java/com/hantsylabs/example/ee7/Resources.java
	common/src/main/java/com/hantsylabs/example/ee7/jsf/DebugPhaseListener.java
	common/src/main/java/com/hantsylabs/example/ee7/jsf/ViewActionBean.java
	common/src/main/webapp/WEB-INF/web.xml
	common/src/main/webapp/index.html
	common/src/main/webapp/page1.xhtml
	common/src/main/webapp/page2.xhtml
	common/src/main/webapp/viewAction.xhtml
	jsf/fileupload/src/main/java/com/hantsylabs/example/ee7/jsf/FileUploadBean.java
	jsf/fileupload/src/main/java/com/hantsylabs/example/ee7/jsf/Html5Bean.java
	jsf/fileupload/src/main/java/com/hantsylabs/example/ee7/jsf/ThemeSwitcher.java
	jsf/fileupload/src/main/webapp/fileUpload.xhtml
	jsf/html5/src/main/webapp/html5.xhtml
	jsf/theme/src/main/webapp/WEB-INF/faces-config.xml
	jsf/theme/src/main/webapp/contracts/alternative/css/cssLayout.css
	jsf/theme/src/main/webapp/contracts/alternative/css/default.css
	jsf/theme/src/main/webapp/contracts/alternative/template.xhtml
	jsf/theme/src/main/webapp/contracts/default/css/cssLayout.css
	jsf/theme/src/main/webapp/contracts/default/css/default.css
	jsf/theme/src/main/webapp/contracts/default/template.xhtml
	jsf/theme/src/main/webapp/theme.xhtml
	jsf/theme/src/main/webapp/themed-alt/index.xhtml
	jsf/theme/src/main/webapp/themed-default/index.xhtml
	jsf/theme/src/main/webapp/themed-dyn/index.xhtml
	pom.xml