Fix revert for pages in directories, as seen in issue #736
add option to specify custom template directory
Merge pull request #758 from samer/master

Fix revert for pages in directories
Merge pull request #762 from pdenes/add_template_dir_option

add option to specify custom template directory