[Fix #397] 404 page
Merge pull request #398 from k88hudson/397

[Fix #397] 404 page
issue#394 - resolve issue#394's 1&2 ticket
Templates page fixes from QA ticket
Merge pull request #401 from flukeout/templateUpdates

Templates page fixes from QA ticket
issue#394 - resolve issue#394's 1&2 ticket
[#402] Improved jittery scroll
Merge pull request #403 from k88hudson/hopping

[#402] Improved jittery scroll
Merge pull request #399 from kevin000/issue#394

issue#394 - resolve issue#394's 1&2 ticket
Merge remote-tracking branch 'upstream/master'