Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
updated photo model