Worked on database
Merge branch 'master'

Conflicts:
	AndroidManifest.xml
	src/org/concordacademy/photoapp/Overview.java