uncommitted
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	build/classes/.gitignore
	build/classes/photohub/TablePhoto.class
	build/classes/photohub/TableUser.class