no message
client
Merge branch 'master' of https://github.com/AxelS33/WaysProject

Conflicts:
	WaysServices/WaysServices.v11.suo
Merge branch 'master' of https://github.com/AxelS33/WaysProject