add ng-grid, settings to func
cleanup settings
fix angular issue
Merge branch 'feature/settings_per_base' into develop
Merge branch 'develop'