Merge DOM

Conflicts:
	public_html/include/lists.html
Merge origin/master