add question done!
Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project

Conflicts:
	app/src/main/java/com/android/mobileapp/Tab3Fragment.java