fixed templates and created 3 module hooks
Merge branch 'kendall2'
fixed templates and 3 hooks
Merge branch 'master' of https://github.com/tleung999/simplicity
fixed template and built 3 hooks