a
Merge branch 'master' of https://github.com/DVDPT/ASI

Conflicts:
	code/web/ServicesLauncher/App.config