Creating template
Merge branch 'master' of ssh://api-octopussy.rhcloud.com/~/git/api into Octopussy-2.0