merge
Merge branch 'dev' of https://github.com/TehNanor/beeroclock into dev