Added inline editing for pure mvc templates
Merge with latest