problem general & content
Merge branch 'master' of github.com:Kagamine/CenaPlus

Conflicts:
	CenaPlus.Server/ServerMode/Contest/Problem/General.xaml