326 - updating website settings
Merge remote-tracking branch 'origin/master'