Merge branch 'master' of https://github.com/jacksharpe/JSWeb

Conflicts:
	inc/config.php
ddddd

ddd