Upgrade wx
Merge branch 'fix-linux-build'

Conflicts:
	src/StdAfx.h
	src/config.cpp