Merge pull request #33 from wybo/master

Uncommented lines that cause the template model not to load in Chrome
Merge remote-tracking branch 'upstream/master'