ARQUIDEAS-933 # Ubercart templates
Merge branch 'master' of github.com:andreyh13/arquideasjoined