create whitelist column
add map type controls
Merge branch 'master' into gh-pages

Conflicts:
	README.md