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

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

Conflicts:
	Makefile