hi 3
Merge branch 'master' of https://github.com/beeriza/hangout-mgr.git

Conflicts:
	Hangout/src/com/hang/hangout/MainActivity.java