new values for shieldstance
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	res/changeableInfo.txt
push