no message
Merge branch 'master' of https://github.com/Team-Papaya-Web-Services-and-Cloud/Web-Services-and-Cloud-Teamwork-2014

Conflicts:
	Votter/Votter.Services/Controllers/VotesController.cs