Merge branch 'development' into qa
working on double click issue on calendar
Merge branch 'qa' into development
need to get out of the living room