zzdever, 20140620, merge of the implementation of drag and rotate