More copying
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Discussions.h
	Client/Paper.cpp
	Client/Paper.h