Merge branch 'qa' into development
down merge
fixed dashboard grid height to 300px
working on calendar filter, made bindings and elements more like mf
working on calendar filter
taskreport
some shit
Merge branch 'development' into qa