Just commiting
Merge branch 'master' of https://github.com/VikingOrg/viking.git
Merge branch 'master' of https://github.com/VikingOrg/viking.git
Changes (in progress) for reports