upgrade to 2.2
merge erb evaluate code as deface was not recognizing the code block
Merge pull request #36 from sbasir/master

Upgrade to 2-2-stable