Polish

- upgrade to reactor M3
- re-introduce html5 shim
- polish controller