Removed composer.lock
Merge branch 'dev'
Added activities data format
Added activities data format
Added activities data format
Added activities data format
Merge branch 'dev'
Merge branch 'dev'
Fixed separator replacement and readded HTML output
Fixed separator replacement and readded HTML output