Updates on HMVC and template #1972

Merged
merged 15 commits into from Oct 3, 2013