Keep concrete5 composer.lock
Change force upgrade url to new url
Merge pull request #1032 from mlocati/keep-composer-lock

Keep concrete5 composer.lock
Merge pull request #1200 from Mnkras/patch-1

Change force upgrade url to new url
getting rid of layouts in global area
tweaks to z-index
Fix #1303
Fix #1360
Fix #1361
Fix #1025
Fixing file storage location data loss when saving form with same location
5.7.1 migration script
Enabling color picker widget to allow empty
Hiding page template on single pages in sitemap
Getting rid of ccmAlert error when moving stacks
Improved readability

Clarity never hurts
Always use custom view if provided

In the (new?) 5.7 version of BlockView, you can still provide a custom filename to $bv->render(), but it isn't always honored. It is only honored if the BlockView also has a block attached to it. If a BlockView doesn't have a block attached to it, then the custom template you requested will not be rendered, but it will render to the default "view.php" instead. You can circumvent this behavior by providing the custom template in $controller->blockViewRenderOverride, but that's just a workaround, not a solution. If the BlockView allows you to pass in a template in the 'render' method, then it should try to honor it. I added some code that does just that.
Always use custom view if provided

The previous commit was only half a solution to the problem: you still couldn't pass in custom templates names that referred to a directory. It would break if you requested to render "blocks/mine/templates/alpha/view.php" by doing $bv->render("templates/alpha"). That was possible in Concrete < 5.7, and the above adjustments make it possible in 5.7 as well. It's much cleaner and closer to the logic in 5.6.3.1 as a bonus.
Fixing global area issue
Fix layout delete issue, fix layout adding to top of the area.