Tax factory
Merge branch 'master' of https://github.com/lloc/Multisite-Language-Switcher

Conflicts:
	includes/MslsOptionsTax.php