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
Show user attributes names instead of handle
(It's just a proposal)
I'm wondering why the normal users should view the handle of custom user attributes (getAttributeKeyDisplayHandle) instead of their names (getAttributeKeyName).
In my mind I see the handles as an internal representation of the attributes, and the name as the text to be shows. Am I missing something?
Correct support for plural forms in Concrete5_Helper_Date->timeSince()
In English (and in many other languages) he have two forms for each words: singular (eg: day) and plural (eg: days).
Anyway some language have just one or more than two plural forms (for example Russian has 3 plural forms): see http://translate.sourceforge.net/wiki/l10n/pluralforms
The correct use of plural forms would be to use the recently added `t2()` function
Same as above for Concrete5_Job_IndexSearch->run()
Same as above for Concrete5_Job_RemoveOldPageVersions->run()
Same as above for the removal of pages with sub-pages
Same as above for /web/concrete/tools/dashboard/sitemap_empty_trash.php
Same as above for /web/concrete/tools/files/bulk_properties.php
bind variables instead of string concatenation

better performance by avoiding hard parses and better security by reducing sql injection possibilities
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
Show localized block type names and descriptions

Block type names and descriptions are always shown in English (with the
methods getBlockTypeName and getBlockTypeDescription of the class
Concrete5_Model_BlockType).
This pull request changes these two functions adding a call to t().
Filter by more extensions/type in file manager

This edit allows to specify more than one value for fType and/or
fExtension.