ARQUIDEAS-1123 # project template
ARQUIDEAS-1122 # user project template
Merge branch 'master' of github.com:andreyh13/arquideasjoined