copy-past from LABB-29
copy-past from LABB-49 and delete redundant
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