fixing broken Application.xml tag
Merge branch 'master' into orm_js