first itteration
moving templates to djadmin
merge