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

Conflicts:
	EAGLView.m