...
Merge branch 'master' of github.com:jackdbernier/coveo-blitz-2013 into alain