Various fixes
Merge branch 'master' of github.com:satya164/Evolve

Conflicts:
	gtk-2.0/gtkrc