Minor fixes in gui scaling.
Minor fixes in element carriers. Waves were not correctly inserted into table.
Merge branch 'master' of https://github.com/xkings/PokemonTD