Merge branch 'development' into qa

* development:
Merge branch 'development' into qa
working on 401 error
created test area
working on 401
renamed the report area to reporting
fixed, I think, the equipmentgrid error
fixed the equipmenttasklist bug
Merge branch 'qa' into development
down merge