Fixed a few (error) messages
Custom maps can now be nominated for map voting
Merge branch 'dev'

Conflicts:
	wml.sp
Fixed errors caused by merginf, duh...