update
Merge branch 'master' of https://github.com/Littlebox222/WaveLocation

Conflicts:
	WaveLocation.xcodeproj/project.pbxproj