Merge branch 'origin/master'
updated media templates
updated config
fixed configuration
configured admins
Merge branch 'origin/2.3.1'