Merge pull request #1 from krzywojc/master

project kickoff
fixing velocity template issue
Merge pull request #1 from matfed/master

Fixing velocity template issue