Oauth2

Conflicts:

	templates/cf-aws-template.yml.erb