meta fix
Merge branch 'dev' of github.com:VizioArt/dock into dev
frontcontoller and meta small fix
Merge branch 'dev' of github.com:VizioArt/dock into dev