Finished trade_proposed and added player inventory and health status

* also changed log messages to include player number
Merged and fixed minor bug in trade_proposed and player inventory handling
Merge branch 'trading_stage' of https://github.com/iteloo/the_island into trading_stage

Conflicts:
	assets/main.js