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

Conflicts:
	Wave/AndroidManifest.xml
	Wave/src/com/greylock/wave/WaveMainTabsActivity.java