added photos, tags, colorbox plugin
fixed merge conflict