Fat commit with everything, easier rebasing that way
Quick splash screen fix
Better fix for splash screen
Fix a mac compilation error
Merge pull request #166 from fvichot/dataManager-refactor2

Data Manager refactor