update template
support FLICKR_EXIF_TARGET_ID_NAME
Merge branch 'refs/heads/master' into stable