Merge timer
Merge branch 'to_delete' of https://github.com/ClaraVista-IT/claraML into to_delete

Conflicts:
	src/main/scala/entry/MFMain.scala
Merge branch 'to_delete' of https://github.com/ClaraVista-IT/claraML into to_delete

Conflicts:
	src/main/scala/entry/MFMain.scala