Merge "Moved Gesture::State and -::Type to gesture-enumerations.h." into devel/master