Some commits, Kalos crashing again
Merge branch 'master' of https://github.com/Snaquaza/Tervari

Conflicts:
	mods/kalos2/abilities.js
	mods/kalos2/pokedex.js
	mods/kalos2/scripts.js