Merge branch 'levelmanager' into develop

Conflicts:
    Basically everything

Regressions:
    -In the levelmanager branch, timers reset properly when levels were
    reloaded. Now they do not. See Issue #35.
    -In levelmanager, the camera scrolled. Now it does not. See Issue
    #36