Conflicts: js/app.js js/service.js js/services/utils-service.js test/services/model-service_test.js
In order to better follow the google naming convention. See https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub