Remove doctype
Merge branch 'dev'