Merge pull request #12 from yuhua-chen/michael

Update demo.gif
Add transEnd callback function in settings and fix bug of touch event position on mobile device
Merge pull request #13 from yuhua-chen/will

Add transEnd callback function in settings and fix bug of touch event po...
Merge branch 'development' into michael and fix conflicts.

Conflicts:
	demo.html
	js/mawbutton.js