commit
Merge branch 'dev' of github.com:realjade/shanlan-node into dev

Conflicts:
	lib/staticFilter.js