Merge branch 'updates'
apply patch to fix infinite loops redirects

https://www.drupal.org/node/1796596#comment-8506117
Merge branch 'infinite-loops'
install images caption field module
install multi upload field field module
install multiupload_imagefield_widget module
add script to make albums images equal height
Revert "add script to make albums images equal height"

This reverts commit 5f11fa84943b4be52e470ad50390f42e6c6cc5f0.
add script and sass to make equal height albums
Merge branch 'multi-upload'
Merge branch 'master' into updates