Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
test for ip address
Merge branch 'dev' of https://github.com/FirmaExpress/FirmaExpressR into dev