Merge branch 'master' of https://github.com/esohns/yarp

Conflicts:
	Yarp/Makefile.am.user
	common/Makefile.am
	net/rpg_net_common.h
	net/rpg_net_module_eventhandler.cpp
	net/rpg_net_module_eventhandler.h
	net/stream/rpg_stream_base.h
	net/stream/rpg_stream_base.inl
	net/stream/rpg_stream_module_base.h
	test_u/client/rpg_client_gui.cpp
	test_u/net/net_callbacks.cpp
	test_u/net/net_client.cpp
	test_u/net/net_eventhandler.cpp
	test_u/net/net_server.cpp
Merge branch 'master' of https://github.com/esohns/yarp

* 'master' of https://github.com/esohns/yarp:

Conflicts:
	Yarp/Makefile.am.user