vik-off-framework templates update
merge