Merge branch 'dev' of github.com:ElectricEasel/btr into dev
Merge branch 'master' of github.com:ElectricEasel/btr into dev
menu fix, favicon