Merge branch 'develop_unit_register' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_unit_register
