locals added
Merge branch 'master' of https://github.com/nakosung/cargoship-webapp