Update FSFolder.java
Update FSObject.java
Update FSObject.java
Create JSF main page for Web-service
Modify index.xhtml
Merge branch 'origin/LABA-46'

Conflicts:
	core/src/main/java/com/engagepoint/labs/core/models/FSFolder.java
	core/src/main/java/com/engagepoint/labs/core/models/FSObject.java