final version of core
Merge branch 'master' of https://github.com/CallanIwan/Aranha

Conflicts:
	core/network/network_handler.py
	core/network/protocol.py