Justin add template
Merge branch 'master' into jamie_20140919