starup file changed [testing]
fixed some points in startup in hotfix branch
again changed startup by testing branch
Merge branch 'testing'

Conflicts:
	startup.txt