Merge branch 'master' of https://github.com/wkimeria/ngx_borderpatrol
Merge branch 'master' of https://github.com/wkimeria/ngx_borderpatrol