update the android to v4
Merge remote-tracking branch 'origin/master'

Conflicts:
	MicroMeeting/.project
	MicroMeeting/res/values/strings.xml