Post Gaia vacancy sep 2014
Merge branch 'master' into lou-experiment
Merge branch 'lou-experiment'
Correction on customers