Initial commit
Merge branch 'release/1.0.0'
conflict fixed
adds modal idW
extracts some of the modal handling out of navigation stack - as it should be
betterm odal
Merge branch 'master' into develop