velocity templates
Merge branch 'velocity'