Merge commit '6286be880e1b138ea4b39b34a715c6196c0d5e79'

Conflicts:
	public_html/js/spjs.js