Use mw.msg instead of JSMessages
Merge branch 'blac-17' into phalanx-redoux