fixes n things
Merge branch 'master' of https://github.com/JPokemon/jpokemon-rest-server-lib
js api works