Seperation of Client and Server version
Merge remote-tracking branch 'origin/master'

Conflicts:
	client_mods.txt
Merge branch 'master' of https://github.com/Yulife/Wanderlust-Reloaded

Conflicts:
	client_mods.txt