server configured.
server configured.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess