Merge pull request #26 from mehere/dev

Pull Request from dev -> dev-wee on 15/2
Remove  a bug in _upload.php
Resolved conflicts
Resolving conflicts
Resolving conflicts
Merge pull request #27 from mehere/dev-wee

Updates on scheduling algo