Revert "Revert "Merge branch 'master' of https://github.com/orisimo/TheVillage""

This reverts commit 1b3f35cd77a89eeca8ccebe1f40d3173cf5ad883.
Merge branch 'master' of https://github.com/orisimo/TheVillage