fixes #13
fixes #14
CSV Import, Scheduler
Bugfixes
Merge branch 'develop'