updated templates config
updated static config
Merge branch 'dev' into prod