Guild war
Merge pull request #85 from ninjalulz/master

Guild war for TFS 1.0
fix
Merge branch 'master' of https://github.com/felipetmartini/ComodatoSite