VALG 28 - New templates and changes for inline editing.
Merge branch 'develop' into VALG-28
Merge branch 'VALG-28' into develop