fixed images
change masterMerge branch 'master' into LocationTemplate