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
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
Merge pull request #1018 from Remo/scrapbook-fixes

fix dashboard style for scrapbook