cleanup admin*
html_writer/string replacement
Merge branch 'jpeak5' into dev