Merge branch 'master' of https://github.com/tonyatoms/glissando

Conflicts:
	iOS/glissando/glissando/ViewController.m
remove instead of comment out listener to resolve git conflict