Merge pull request #1 from reekoheek/master

[UPDATE] Changed layout as optional argument to bonoblade
[UPDATE] Comply to bono-theme
fixed how to resolve template file