Merge pull request #4 from antonkorotkov/development

Activity History fix
Fix to - CSV export and dropdown fields as "on"
Merge remote-tracking branch 'upstream/development' into development