After merge

Signed-off-by: alfabrad <zerovamp@hotmail.com>
Merge branch 'master' of https://github.com/alfabrad/ProMeta

Signed-off-by: alfabrad <zerovamp@hotmail.com>

Conflicts:
	Code/templates/config.codekit
	config.codekit
Services section almost finished

Signed-off-by: alfabrad <zerovamp@hotmail.com>