corrected type check in navigation
Merge pull request #4 from massiveart/feature/data-grid

Feature/data grid
Merge remote-tracking branch 'origin/develop' into feature/navigation
Merge pull request #5 from massiveart/feature/navigation

Feature/navigation