Merge pull request #81 from mehere/dev

Pull Request from dev -> dev-wee on 3/3
Merge pull request #82 from mehere/dev

Pull Request from dev -> dev-wee on 4/3
Retry algorithm v2
Resolve conflicts
Resolve conflicts
Remove hard coding for adhoc-scheduling
Merge pull request #83 from mehere/dev-wee

Remove bugs in adhoc scheduling.