removed old bootstrap dependencies
Merge branch 'develop' into feature/nvrefactor
Merge branch 'feature/nvrefactor' into develop