WelcomeWindow UI Changes
Merge remote-tracking branch 'origin/Min' into Mike

Conflicts:
	src/project/DataManager.java