Merge pull request #510 from chrox/master

fix conflicts of two finger swipe gesture for flipping mode and showing ...
get rid of several dirty hacks