changes
Merge branch 'master' of https://github.com/WebServicesAndCloud2014TeamStarFruit/WebServicesTeamStarFruitServices

Conflicts:
	TodoTasks.Services/TodoTasks.Services.csproj