Merging
Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project

Conflicts:
	app/src/main/res/layout/fragment_main.xml