WM: Ported new site structure
Merge pull request #3 from onaio/template_ready

WM: Ported new site structure