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