Checkin to merge
Merge branch 'master' of https://github.com/ServiceStackApps/TechStacks

Conflicts:
	src/TechStacks/TechStacks.ServiceModel/Technologies.cs