Amend base branch for deployment branch
Additional files added for deployment to webserver

Conflicts:
	.htaccess