*update protocol/ remove getEquips
Merge branch 'net' of github.com:DeaDiablo/rania_multiplatform into net

Conflicts:
	Rania/src/com/game/rania/controller/LocationController.java