Creating template
Merge branch 'master' of ssh://saml2testapp-netsourcedev.rhcloud.com/~/git/saml2testapp

# By Template builder
# Via Template builder
* 'master' of ssh://saml2testapp-netsourcedev.rhcloud.com/~/git/saml2testapp:
  Creating template

Conflicts:
	config.ru