update prod, 2014-03-27

Pull recent changes from dev to prod