sth

Some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fresco/AndroidManifest.xml
	Fresco/res/layout/activity_add_edit.xml
	Fresco/res/values/strings.xml