up
Merge remote-tracking branch 'origin/master'

Conflicts:
	2013JP/C_spirit2.cpp