Merge pull request #13 from SU-SWS/7.x-2.x-jsadev

7.x 2.x jsadev
7.x-2.0-alpha4
Merge pull request #14 from SU-SWS/7.x-2.x-jsadev

Added 6-col-tall, icon-square
overlay not overly
7.x-2.0-alpha5
Merge branch '7.x-2.x-dev' into 7.x-2.x-jsadev

Conflicts:
	stanford_image.field_group.inc
	stanford_image.info