Debug, add template funcitonality
Merge branch 'master' of github.com:paboden/back_to_parent