Fixed: Head broken, EntityLoadTestCase fails due to misnamed file.
Merge pull request #460 from jenlampton/fix-head-broken-entity-load-test

Fixed: Head broken, EntityLoadTestCase fails due to misnamed file.
Issue #86: Stripping down block module to be responsible only for custom blocks.
Issue #328: Provide a way to get the last inserted ID from db_merge().
Merge pull request #461 from quicksketch/328/db_merge_result

Issue #328: Provide a way to get the last inserted ID from db_merge().
Merge branch '1.x' into 86/layout_module
Fixing broken path to gear image.
Issue #86: Adding upgrade path for blocks to layouts. Adding contextual link support.
Merge with 1.x.

' into 86/layout_module

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Issue #86: Restoring contextual links functionality for blocks. Converting existing blocks to use layout config instead of variables.