initial commit
add canvas slider
fix merge
fix merge
merge
update template