call to toJsonDetailed in controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ro/roda/web/FileListController.java
scheduler-related code