Updated dev front controller
Merge remote-tracking branch 'upstream/master'
Merge pull request #422 from stefk/app-dev

App dev