Merge branch '34_Task' into prod
Merge branch '41_task' into prod

Conflicts:
	sites/all/modules/custom/gfs_idevels/gfs_idevels.module
Merge branch '34_Task' into prod
Merge branch '34_Task' into prod
#76 Problem with logos in Available At: fixed theming and view displays
#66 Interface to change logo: added admin page with changing logo functionality
Merge branch '76_task' into testing

Conflicts:
	sites/all/modules/custom/gfs_idevels/gfs_idevels.module