Link7/virtual-pages-with-templates — pull request #53 by deanearlbartolabac (2014-03-05 02:40:49+00:00)
Title: 4 branch merge master

- this pull request contains the #4 issue fixes as well as fixes the conflicts with the master