fixed Vancouver 2014 dates to solve conflict
fixed Vancouver 2014 dates to solve conflict


Former-commit-id: c8b53e76e59bae7484817735fb808fc281b37bc3
joelaha/devopsdays-web,masteinhauser/devopsdays-web,benjohnson77/devopsdays-web,benjohnson77/devopsdays-web,masteinhauser/devopsdays-web,masteinhauser/devopsdays-web,joelaha/devopsdays-web,joelaha/devopsdays-web,joelaha/devopsdays-web,benjohnson77/devopsdays-web,masteinhauser/devopsdays-web,benjohnson77/devopsdays-web