v1.3 closed
Merge remote-tracking branch 'origin/v1.3' into v1.3

Conflicts:
	.idea/misc.xml
	server.py