SAM Setup
Merge branch 'master' of https://github.com/puruckertom/ubertool_ecorest

Conflicts:
	.gitignore
Merge branch 'master' into cgi