Added ViewScoped context to support JSF view scoped beans
Merge branch 'master' of github.com:stather/cdi-unit into stather-master

Conflicts:
	cdi-unit/pom.xml
	cdi-unit/src/main/java/org/jglue/cdiunit/internal/WeldTestUrlDeployment.java
Merge branch 'master' of git@github.com:BrynCooke/cdi-unit.git