small fixes
bump version
bump template version
merge master