Develop

Merged jebaur requested to merge develop into master

Merge develop with master for upcoming sign up period

Merge request reports