refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cr_connection.cpp
	src/cr_event_loop.cpp
	src/cr_event_loop.h