changed persistence

github deleted one of my commits
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/example/myapp/MyActivity.java