Fix latest bugs from spreadsheet
Fix latest bugs from spreadsheet
Merge branch 'master' of https://github.com/byumoa/LovingDevotion

Conflicts:

PaintingResources/krishna_butterballs/highlights/highlights_3/highlight.
png

PaintingResources/krishna_butterballs/highlights/highlights_3/highlight@
2x.png

PaintingResources/vishnu_attendants4/perspectives/perspectives_2/overlay
.png

PaintingResources/vishnu_attendants4/perspectives/perspectives_2/overlay
@2x.png

PaintingResources/vishnupatta/highlights/X_highlights_3/ButtonPlacement.
plist
	PaintingResources/vishnupatta/highlights/X_highlights_3/Zoom.plist
	PaintingResources/vishnupatta/highlights/X_highlights_3/highlight.png

PaintingResources/vishnupatta/highlights/X_highlights_3/highlight@2x.png
	PaintingResources/vishnupatta/highlights/X_highlights_3/overlay.png
	PaintingResources/vishnupatta/highlights/X_highlights_3/overlay@2x.png

PaintingResources/vishnupatta/highlights/highlights_3/ButtonPlacement.pl
ist
	PaintingResources/vishnupatta/highlights/highlights_3/Zoom.plist
	PaintingResources/vishnupatta/highlights/highlights_3/highlight.png
	PaintingResources/vishnupatta/highlights/highlights_3/highlight@2x.png
	PaintingResources/vishnupatta/highlights/highlights_3/overlay.png
	PaintingResources/vishnupatta/highlights/highlights_3/overlay@2x.png

PaintingResources/vishnupatta/highlights/x_highlights_3/ButtonPlacement.
plist
	PaintingResources/vishnupatta/highlights/x_highlights_3/Zoom.plist
	PaintingResources/vishnupatta/highlights/x_highlights_3/highlight.png

PaintingResources/vishnupatta/highlights/x_highlights_3/highlight@2x.png
	PaintingResources/vishnupatta/highlights/x_highlights_3/overlay.png
	PaintingResources/vishnupatta/highlights/x_highlights_3/overlay@2x.png