Merge remote-tracking branch 'origin/Preferences'

Conflicts:
	Nintenbro.iml