Updated freerun edit button to open in new window
Merge branch 'master' of https://github.com/NMerch/scheduler into next
Updated freerun edit button to open in new window
Fixed merge conflict
Removed .idea files
Merge pull request #21 from NMerch/next

Merging NMerch/Next with origin/next