replaced view.css with addHeaderItem to avoid unnecessary request
fixed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/concrete/blocks/google_map/controller.php
set slideshow height on serverside
missing google map update
use email instead of name if specified
option to hide concrete5 version in the head

http://www.concrete5.org/index.php?cID=404107
Merge git://github.com/concrete5/concrete5
Merge branch 'master' of https://github.com/Remo/concrete5
Merge branch 'master' of https://github.com/concrete5/concrete5.git
merge
Hide canonical url for root page

The canonical url field in page properties should not be visible for
the home page: users shouldn't be able to edit it since it should
always be "/"
Fix Return Value `FileAttributeKey::getByHandle()`

Fix return value for `FileAttributeKey::getByHandle()` where method will
return `-1` on initial failure to find object by handle. On following
attempts `false` will be returned

- Change to return `false` when `$ak === -1`
Merge branch 'master' of git://github.com/concrete5/concrete5

Conflicts:
	web/concrete/core/controllers/blocks/slideshow.php
	web/concrete/elements/header_required.php
new dashboard style for ancient scrapbook
remove unused file
fix table class to display correctly on new c5 version
Fixed slow loading page properties dialog.

There were times that editing the page properties caused multiple calls to {domain}?ts=XXXXX&_=XXXXX. This resulted in a very slow load time for the properties dialog.
Update core/models/file_list.php for windows compatibility

exportArchive() now using ZipArchive class instead of a linux command in exec(). We can now export images in Sample Content Generator package on Windows servers.
Update file_list.php

Additional check to make sure the ZipArchive extension is loaded and revert to the old behaviour if it isn't. Added a try-catch in case they both fail. Thanks Remo!