added a new folder for services
added missing entry to nginx.conf
Adding missing directory dependency
Merge remote-tracking branch 'ip/master' into haf/master

Conflicts:
	manifests/init.pp
	manifests/params.pp
	templates/nginx.conf.erb