JSF work with Services
JSF work with Services
Merge branch 'origin/new'

Conflicts:
	core/src/test/java/com/engagepoint/labs/core/dao/FSFileDaoImplTest.java
	core/src/test/java/com/engagepoint/labs/core/dao/FSFolderDaoImplTest.java
	web/src/main/java/com/engagepoint/labs/web/controllers/TreeBean.java
	web/src/main/webapp/templates/treeInfo.xhtml