fixed tests and issue with '/'
Merge branch 'origin/LABA-47'

Conflicts:
	core/src/test/java/com/engagepoint/labs/core/dao/FSFileDaoImplTest.java
	core/src/test/java/com/engagepoint/labs/core/dao/FSFolderDaoImplTest.java