Add Srv
Add Directive
Merge remote-tracking branch 'origin/master' into services

Conflicts:
	src/index.html