Merge branch 'dev'

Conflicts:
	new.html