Rearrenged controls
Merge remote-tracking branch 'origin/K_Protsenko' into K_Protsenko

Conflicts:
	src/PrizmMainProject/Properties/licenses.licx