HLint
Merge branch 'master' into dbus

Conflicts:
	src/System/Tianbar/WebKit.hs
HLint