bug import
Merge branch 'develop' into michaelvakulik
Add modal import content