project error
Merge branch 'UIdevelop' into develop

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	.idea/vcs.xml
update get pics API
Merge branch 'develop' into UIdevelop

Conflicts:
	app/app.iml