Merge branch 'feature/avatars' of github.com:mheiniger/PalaceProxy into feature/avatars

Conflicts:
	PalaceClient/adapter/display/BitmapData.js
	PalaceClient/adapter/graphics/codec/PNGEncoder.js
	PalaceClient/palace/model/PalaceProp.js
	PalaceClient/palace/model/PalacePropStore.js
	PalaceClient/palace/webservice/OPWSGetProps.js
	PalaceClient/palace/webservice/OPWSNewProps.js
	WebClient/client.js
	app.js
Merge branch 'feature/avatars'