Update template.soy to include msg/messages.js
Merge branch 'slave-joshua' into slave