Added takistan, panthera2 and fallujah to functions.php. Fixed typo in modules/maps/6.php
Merge branch 'master' into issue-109
Merge pull request #110 from wriley/issue-109

Added takistan, panthera2 and fallujah to functions.php