Merge pull request #58 from msrb/master

Simplify JSF assistant