Added some test data
Merge remote-tracking branch 'origin/feature-dynamic_form_building' into dev
Changed waiting activation to after 1 second.
Merge remote-tracking branch 'origin/dev' into release