Merge branch 'testing' into beta
Merge branch 'orient-fix' into beta
Merge branch 'orient-fix' into beta
Merge branch 'beta' of https://github.com/kylefrost/Desk-Clock into beta