Merge branch '7.x-4.x' into 7.x-4.x-springboard_api_api_keys
Merge remote-tracking branch 'origin/7.x-4.x' into 7.x-4.x-admin_interface

Conflicts:
	springboard/modules/springboard_admin/springboard_admin.module
re #768 - adding redirect from /admin to /admin/springboard for user roles that get the SBUX
re #768 - updating submit handler to use new helper function.
re #768 - adding documentation
formatting clean up
Merge branch '7.x-4.x-admin_interface' of https://github.com/JacksonRiver/springboard_modules into 7.x-4.x-admin_interface

Conflicts:
	springboard/modules/springboard_admin/springboard_admin.module
re #774 - redirecting users to the newly created node's edit form after node clone.
re #789 - adding menu local task for logging out to /user menu.
re #771 - updating all Springboard admin paths to /springboard/* instead of /admin/springboard/*
re #771 - creating custom Admin Menu item for Springboard admin pages.
coder clean up
coder cleanup
Merge branch 'refs/heads/7.x-4.x-admin_ui_springboard_paths' into 7.x-4.x-admin_interface

Conflicts:
	springboard/modules/springboard_admin/springboard_admin.menu.inc
	springboard/modules/springboard_admin/springboard_admin.module
	springboard/modules/springboard_views/springboard_views.views_default.inc
merge cleanup
merge cleanup
re #771 - removing "customize dashboard" link from SB dashboard
re #771 - updating Webform Goals menu item to use springboard path
In  sb_social_settings_load verifying the node is an enabled type
Merge branch '7.x-4.x-admin_interface' into 7.x-4.3-beta1