LABB-40 updated
LABB-40 updated
LABB-40 updated
copy-past from LABB-29
copy-past from LABB-49 and delete redundant
Faces Componentcreated
Faces Component created
Merge branch 'feature/LABB-40' into develop

Conflicts:
	browser-component/pom.xml
added composite components with SPI (wrong module)
Merge remote-tracking branch 'origin/feature/LABB-42' into develop

Conflicts:
	browser-showcase/src/main/java/com/engagepoint/university/ep2013b/browser/showcase/MainBean.java
	browser-showcase/src/main/webapp/WEB-INF/web.xml
	browser-showcase/src/main/webapp/home.xhtml
added JBehave steps and stories
added JBehave steps and stories
added JBehave steps and stories
rollback for Demo (all in show-case)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	browser-test/pom.xml
rollback for Demo (all in show-case)
update
Merge remote-tracking branch 'origin/feature/LABB-44' into develop
Merge remote-tracking branch 'origin/feature/LABB-44' into develop
update