back-end
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/config.php
back-end