Merge branch 'bt_macmini_working' into working
Fixing calendar
v0.0.37 Add / Edit group
Merge branch 'bt_macmini_working' into working
Merge branch 'working'