Merge Development to Master

Joseph Saliminrequested to merge
development into master

Should have done this a week ago. Will fix this later!

Merge request reports