Merge stash
User jqueryui and touch-punch for event sortability