Fixed conflicts
added add asset temp version
final for today
Fixed conflicts
added add asset temp version
final for today
Merge remote-tracking branch 'origin/develop' into develop
added close modal after creating an asset