Creating template
try pull and fix conflict from openshift
Merge branch 'master' of https://github.com/coursemdetw/2014cda
0618