-IllegalArgumentException (doesn't exist)
+InvalidArgumentException
about project.dir var in templates.dir
merging in changes from branches/0.11, 748fcba10caa3e197e11b7c5b999dc0199eef3ba to 19e84aea052bb1b99dbb6ab9ebf3907a36ceccd8