Merge branch 'updates'
install field collection module
install field collection views module
apply patch to features

https://drupal.org/node/1153028#comment-7432690
Revert "apply patch to features"

This reverts commit 6569e5a6533d98e434020fb5d87c1434c2f543e8.
Merge branch 'photo_album'
Merge branch 'master' into updates