new commit
Merge commit '587dc3a0c6b5f03a88ca7ad1cf1c3e78507040c1'

Conflicts:
	public_html/js/spjs.js
Merge commit '587dc3a0c6b5f03a88ca7ad1cf1c3e78507040c1'

Conflicts:
	public_html/js/spjs.js