Merge branch 'master' of https://github.com/jkan997/WikiMaps

Conflicts:
	includes/WikiMapHelpers.php