Merge branch 'on_mouse_display_feature' of https://github.com/theypsilon/guake into theypsilon-on_mouse_display_feature

Conflicts:
	src/guake
Merge branch 'theypsilon-on_mouse_display_feature'