;;
Merge branch 'master' of https://github.com/CloudSide/aurioTouch2

Conflicts:
	Classes/RootViewController.mm