Corrects faulty if-loop
Adds page-templates branch back into development