Configure theme for admin module
Configure routing for default controller in main conf
Merge remote-tracking branch 'origin/master'