Update siteconf.rb
Merge pull request #39 from easonhan007/master

fix bug: set default marketing setting to empty string
Merge branch '1.5-stable'
upgrade to Rails 3.2.16
Merge branch '1.5-stable' of https://github.com/daqing/rabel into 1.5-stable