Fixed NamedQuery Bug - to tired yesterday
Merge origin/master