hjacobs/codevalidator — pull request #31 by szuecs (2014-12-01 07:41:33+00:00)
Title: Feature/erb templates2

resolve merge conflicts