Merge branch 'master' into weddings-and-functions
continue to merge branches
upload views term path module
install context module
install tvi module
style weddings landing page and listings
install taxonomy menu module
install context block disable module
apply patch to fix context disable block checkbox

https://www.drupal.org/files/issues/context_block_disabled-undefined_ind
ex_module-2057396-27.patch
remove context block disable
install context block disable dev version
remove context block disable
Revert "remove context block disable"

This reverts commit 74ab00405ebc962f524fc82dff8e707001472d54.
apply patch to context block disable
remove context block disable module
install strongarm
install weddings and functions feature
install features_extra
Revert "install features_extra"

This reverts commit 061aab3842c7f704e304b61e8ba390c0463332cb.
install uuid_features