FE Default Controller
Merge branch 'master' of https://github.com/ottrob/Edge5
Merge branch 'master' of https://github.com/ottrob/Edge5