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
Add possibility to json decode to array

This pull request improves the decode method of the
Concrete5_Helper_Json class to allow decoding objects to php arrays
instead of stdClasses
unused Loader::db removed
sanitize user added select attr values

http://www.concrete5.org/index.php?cID=471278&editmode=
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