Merge branch 'master' into updates
update core to 7.28
Merge branch 'updates'
ignore cached .htaccess
Merge branch 'master' into updates
update google analyics module
update core to 7.29
Merge branch 'updates'
style links in footer 3 to be white
Merge branch 'master' into updates
update core to 7.31
update date module
update backup and migrate module
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