Sprite Basic

Sprite Basic
Merge branch 'master' of https://github.com/petrisrf/pokemononline

Conflicts:
	PokemonServer/src/server/PokemonServer.java