Merge branch 'development' of https://github.com/e-nable/Service-Station into development

Conflicts:
	README.md
Merge branch 'development' of https://github.com/e-nable/Service-Station into development

Conflicts:
	README.md
Merge branch 'development' of https://github.com/e-nable/Service-Station into development