commit før merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ada GUI.v11.suo
	Ada GUI/bin/Release/Ada.vshost.exe.config