small change
splash screen finished
Merge branch 'Jackson-2' into Master2
splash screen
Merge branch 'Master2' into Alex