changes in condition to assets
Merge branch 'design' of https://github.com/elmerfreddy/nsiaf into design