photo metadata
added better search and stuff
resolved conflicts