fixes and temperary templates
Merge branch 'master' of https://github.com/flysaiah/Busker-database