name conventions
Merge branch 'master' of https://github.com/adboomgrp/lodestar_erp