Fix merge (#7)

* Update pokemon.json (RocketMap#1305)

* Matches Polyfill (RocketMap#1100)

* Update index.rst (RocketMap#1322)

updated windows link for nodejs, was 4.4.7 move to 4.5.0

* Move commandline page from wiki to docs (RocketMap#1326)

Reorganizing to keep docs in docs

* fixes (RocketMap#1327)

There! More example.py

* Added Title to command line page and misc fix (RocketMap#1335)

* webworker (RocketMap#1287)

* Output better error when csv file has > 3 fields (RocketMap#1336)

* Correct multi-acc doc

* Prevent header from cutting off bottom (RocketMap#1343)

Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar

* Close info window upon second click (RocketMap#1238)

Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click.
Implements RocketMap#1237

* Decrease Number of Upserted Rows (RocketMap#1091)

* Decrease step size

* Check the type of DB

* setup.bat now won't set paths if already set, now also installs npm (RocketMap#770)

* Various fixes

Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once.

* Update setup.bat

* Updated to not use temp files

As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable.

* Update the "Easy setup" script (RocketMap#1217)

* Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271)

* On demand mode

* On demand mode

* On demand mode

* On demand mode

* Pause before checking time in service

* Fix alphabetical order (RocketMap#1110)

* Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289)

* [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError

* Fix lint errors

* Prevent OSK on Touch

* Select Boxes prevent Virtual Keyboard Appearing on Touch Devices

* remove unnecessary loop

* basic mobile os detection

* fixed order in which some things must be installed

* Fix for some cases of 0,0,0 returns (RocketMap#1097)

Some users reporting 0,0,0 returns on subsequent auth token refreshes
after the first.

* Update pull request template (RocketMap#399)

* Update pull request template

* Changed checklist into a comment

* Stupid markdown comments

* Auth Update for nginx.md (RocketMap#221)

* Auth Update for nginx.md

Adding large block for httpd nginx authentication with reverse proxy

* Update nginx.md

* Removed references to third party docker container (RocketMap#1359)

* Removed references to third party container

* Changed references to container we control

* SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372)

* Change --spawnpoints-only to --skip-empty 

Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this.

* Update commandline.md to include --skip-empty

* Few doc updates (RocketMap#1373)

* Added little Linux thing

* Some doc updates

* little thing

* changed 2nd gen link

* added loc gen

* Enhance Statistics Panel (RocketMap#1241)

* Test Commit

* Revert "Test Commit"
aa
This reverts commit e87c9d5.

* Add sortable Pokemon stats table

* Put back accidentally deleted PokeGyms stats code

* add link to Pokedex

* Styling fixes for statistics panel

* Fix listing errors

* fix some PokéSpelling errors

* Only count visible pokemon/gyms/pokestops

Correct issue (that has apparently existed for a while?) where items
not currently on screen were included in the stats.

* fix linting errors

* add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376)

* add option to specify config file on command line or via env variable

original PR 1341

* Add new config file documentation

Original PR 1341

* Update commandline.md with new config file flags

Original PR 1341

* fix for those not using a config file at all (RocketMap#1377)

* Fixed purge_data query not executing (RocketMap#1247)

* Escaping ampersand in html (RocketMap#1380)

It's groundbreaking. My valid html OCD is kicking in again :D

* Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782)

* Added gym levels to marker icons

Relocated code for determining gym levels to a new function getGymLevel()

* Gym Level Markers

* Compressed changed files (4.9kb ->1.4kb)

* Fixed ternary operator order

You guys are right. I didn't even think of it

* Made the gymPrestige array a global variable

Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666)

* Add gym style option

* Choose between gym marker styles

* lint fix

* Reorganized forts for multiple gym styles

* Reload icons on demand

Used to wait until a mapUpdate(), but that could take up to 5 seconds

* Fixed lint error

* Lossless and optimized large versions

Original large version had heavy artifacts and were not compressed.

Harmony: 35.7KB -> 20.2KB
Instinct: 17.6KB -> 10.1KB
Mystic: 27.4KB -> 11.6KB
Valor: 29.0KB -> 13.9KB
Uncontested: 43.2KB -> 14.6KB

* High-res gym markers for mobile

When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images

* High-res gym markers for mobile

Same thing as the ingame markers

* Load and scale back a higher res version

Mobile users will be able to load the markers without them being blurry

* Whoops, didn't realize stats used these too

* Changed default gym marker to in-game

* Resize icons based on higher res icons

* Revert default gym markers back to shield

* Forgot these

Somehow I forgot to upload these when I added the css for #arenaList :/

* we use sass, we can do crazy programatic stuff like this (RocketMap#1390)

* [FAQ.md] Updated formula

Thanks OurFlagIsMined :3

* Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272)

* Scan for IVs and moves

Clean implementation, bug free?

* Don't ignore moves.json

* whoopsie tabsies

* im on a roll here

* whitespace is really hard guys

* whitespace is really hard guys

* I'm sorry travis senpai

* Don't pass the whole dictonary to pokemonLabel on top of everything else

* Notifications based off % perfection

From owraight's branch

* praise travis

* Fix 0/0/0 results from atypical spawnpoints?

Some spawnpoints spawn the same encounter multiple times an hour. This
should prevent those points from being skipped over in the parsing
process.

* minor text fixes

* Fix get_encountered_pokemon

oops. Thanks sLoPPydrive.

* Default to a whitelist, support a black one

* Stop erroneous empty results when rescanning pokemon

Keep track of of pokemon that get skipped over druing the parsing phase
so we don't think we're getting 0 results from the server.

* Minor text fixes

* Minorer text fixes

* No more white/black flip

--encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht)
is here now.

* Fix up the white/blacklists

Now they're in a mutually exclusive group, and it properly encounter
everything if neither list is set.

* sorry travis

* derp

* leave me alone travis

* Improve moves.json handling

Use RocketMap#1316 more useful moves.json and support move names being translated

* Reduce db requests to one per cell

Instead of one per pokemon. Thanks jchristi and DiscoTim

* text minor fixes

* Handle failed encounters

* Minor fixes to the config.ini.example