sendWave
Merge branch 'master' of https://github.com/allenpark/greylock-hackfest

Conflicts:
	Wave/res/values/strings.xml
Merge branches 'master' and 'master' of https://github.com/allenpark/greylock-hackfest
map layout complete
Merge branch 'master' of https://github.com/allenpark/greylock-hackfest

Conflicts:
	Wave/res/values/strings.xml