Merge branch 'qa' into development
fixed calendars and employeedash
Merge branch 'development' into qa

* development:
  fixed calendars and employeedash
  added equipment task report
  working on report
  some shit
  taskreport
  working on calendar filter
  working on calendar filter, made bindings and elements more like mf
  fixed dashboard grid height to 300px
  down merge