New template home 2013
Merge branch '2013-home-template'