Added entityconnect as dependencies to modules.
Merge branch 'master' into 2317-content-translate

Conflicts:
	sites/all/modules/custom/scratchpads/scratchpads_backend/scratchpads_backend.info
Altered the project grouping.
t() is not required by menu keys.
Updated version and l10n url.
Scratchpads version doesn't apply to GBIFS modules.
Ensure taxonomy hierarchies are imported as expected. Applied my patch from https://drupal.org/node/1605958.  #3663.
Merge branch 'master' into 2317-content-translate
Order tinytax terms by weight.
Merge branch 'master' into 2317-content-translate
Prevent multiple copies of the same term being associated with a single biblio record. #3657.
Prevent multiple copies of the same term being associated with a single biblio record. #3657.
Merge branch 'master' into 2317-content-translate
Added "kmz" files to the allowed file types.
Prevent a few errors during testing.  Comitted for Khalid.
Merge branch 'master' into 2317-content-translate
#3665 fix for 'Missing bundle property on entity of type node' error on taxonomy import
Merge branch '2317-content-translate' into gbif-npt-startup

Conflicts:
	profiles/emonocot_2/themes/scratchpads_em/templates/node--spm.tpl.php
	profiles/scratchpad_2_sandbox/scratchpad_2_sandbox.profile
	sites/all/modules/contrib/apachesolr/solr-conf/schema-solr3x.xml
	sites/all/modules/contrib/apachesolr/solr-conf/solr-3.x/schema.xml
	sites/all/modules/contrib/apachesolr/solr-conf/solr-4.x/schema.xml
	sites/all/modules/contrib/entity/entity_token.info
	sites/all/modules/contrib/entity/tests/entity_feature.info
	sites/all/modules/contrib/entity/tests/entity_test_i18n.info
	sites/all/modules/contrib/feeds/plugins/FeedsTermProcessor.inc
	sites/all/modules/contrib/lexicon/lexicon.module
	sites/all/modules/custom/biblio_scholar/biblio_scholar.info
	sites/all/modules/custom/emonocot/emonocot_checklist/emonocot_checklist.info
	sites/all/modules/custom/emonocot/emonocot_ipni/emonocot_ipni.info
	sites/all/modules/custom/feeds_xls/feeds_xls.info
	sites/all/modules/custom/hashcash/hashcash.info
	sites/all/modules/custom/remote_issue_tab/remote_issue_tab.module
	sites/all/modules/custom/scratchpads/scratchpads_backend/scratchpads_backend.info
	sites/all/modules/custom/scratchpads/scratchpads_backend/views/scratchpads_backend.views_default.inc
	sites/all/modules/custom/scratchpads/scratchpads_biblio/scratchpads_biblio.module
	sites/all/modules/custom/scratchpads/scratchpads_biography/scratchpads_biography.info
	sites/all/modules/custom/scratchpads/scratchpads_blog/scratchpads_blog.info
	sites/all/modules/custom/scratchpads/scratchpads_blog/scratchpads_blog.module
	sites/all/modules/custom/scratchpads/scratchpads_data_integrity/scratchpads_data_integrity.info
	sites/all/modules/custom/scratchpads/scratchpads_file_lock/scratchpads_file_lock.info
	sites/all/modules/custom/scratchpads/scratchpads_forum/scratchpads_forum.module
	sites/all/modules/custom/scratchpads/scratchpads_load_time_log/scratchpads_load_time_log.info
	sites/all/modules/custom/scratchpads/scratchpads_media_gallery/scratchpads_media_gallery.info
	sites/all/modules/custom/scratchpads/scratchpads_media_gallery/scratchpads_media_gallery.install
	sites/all/modules/custom/scratchpads/scratchpads_media_gallery/scratchpads_media_gallery.module
	sites/all/modules/custom/scratchpads/scratchpads_messages/scratchpads_messages.info
	sites/all/modules/custom/scratchpads/scratchpads_migrate/scratchpads_migrate.info
	sites/all/modules/custom/scratchpads/scratchpads_solr/scratchpads_solr.info
	sites/all/modules/custom/scratchpads/scratchpads_species/views/scratchpads_species.views_default.inc
	sites/all/modules/custom/scratchpads/scratchpads_statistics/scratchpads_statistics_aggregator.cron.inc
	sites/all/modules/custom/scratchpads/scratchpads_thumbnail_style_alter/scratchpads_thumbnail_style_alter.info
	sites/all/modules/custom/scratchpads/scratchpads_tweaks/scratchpads_tweaks.info
	sites/all/modules/custom/scratchpads/scratchpads_tweaks/scratchpads_tweaks.module
	sites/all/modules/custom/scratchpads/scratchpads_twitter/scratchpads_twitter.info
	sites/all/modules/custom/scratchpads/scratchpads_user/scratchpads_user.module
	sites/all/modules/custom/silver/silver.feeds_importer_default.inc
	sites/all/modules/custom/silver/silver.info
	sites/all/modules/custom/silver/silver.module
	sites/all/modules/custom/slickgrid/slickgrid.module
	sites/all/modules/custom/spm/spm.info
	sites/all/modules/custom/tinytax/tinytax.theme.inc
	sites/all/themes/scratchpads/css/global.css
Merge branch 'gbif-npt-startup' of https://github.com/burkeker/gbif-npt-startup into gbif-npt-startup