added fromOffice
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloAndroid/src/com/example/helloandroid/Person.java