test
Merge branch 'master' of https://github.com/littlecat1988/Gesture

Conflicts:
	java/com/gomtel/guesture/CreateGestureActivity.java