dasf
Merge branch 'master' of https://github.com/dzipet/webas

Conflicts:
	Rest.Tests/Logic/CreateMapTests.cs
	Rest/Logic/CreateMap.cs