Updated the base template and removed the no longer used services.yml file.
Merge branch 'refs/heads/develop'

Conflicts:
	README.md