Merge branch 'master' into Celtic_Jp

Conflicts:
	.htaccess