Merge branch 'development' into ava
fix in DOCTYPE declaration and various XHTML fixes
fixed DOCTYPE declaration and various XHTML bugs
fixed DOCTYPE declaration and various XHTML bugs
Merge branch 'ava' into development