added ap
added jp database
Merge branch 'master' into jp
added country stuff