added binding set formatter that works with velocity templates
Merge remote-tracking branch 'origin/master'