customize the site settings, plugins, and default.skin
Merge branch 's502-develop' into develop