Something
Merge branch 'master' of github.com:kopelli/api-2014offsite

Conflicts:
	WebRole1/Views/Home/Index.cshtml
Formatting