swing rules
Merge branch 'master' of https://github.com/petrisrf/pokemononline

Conflicts:
	PokemonClient/src/client/ui/AbstractUI.java
walk modifications