Merge branch 'master' into zenx

Conflicts:
	Zen-verda/gtk-2.0/gtk-widgets.rc
	Zen/gtk-2.0/gtk-widgets.rc
update README v0.8.0