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
Readme Header Handcrafted with Love

Changes readme header to new header handcrafted with love in response to
commentary during "Totally Random" about the origin of logo and text.
Text and logo are now crafted by the human hand.
Adds Short Tag Information to Readme

Adds short tag information to readme and methods to enable short tags on
development server. Also, indicates that issue has been discussed.
JS/CSS Versioning support

Check the filemtime of the css/js file to prevent browser caching of
these assets
added is_array to fix when there are no subpages
Remove support for gravar in favor of gravatar

:D
Add link to zip download

Adding the complementary part to mkly's changes, making it more friendly for newcomers to know how to get the latest development build without having to know how to navigate GitHub.
added strtolower to passed extension in mimeFromExtension to handle capitalized file extensions.
added the marketplace library to the autoloader
Added possibility to specify translation contexts
What about introducing the use of msgctxt for ambiguous translations? So translators can better understand how to translate a text.
For example: 'To %s' may have two different translations when used as "Send to recipient" or as "End of a date interval".
The modified web/concrete/elements/permission/duration.php shows a possible implementation.
replace t() with DateHelper

Translation of strings inside dates (monthnames, daynames) should be handled through the DateHelper instead of t().
http://docs.mnkras.com/class_concrete5___helper___date.html#a5f7a7453c70e203543e5e0ab057e3ae5
Use DATE_APP_GENERIC_T instead of literal
composer tweak
Corrects FileVersion::getAttribute() issue

Removes false being set to $mode in returing getAttribute() call, which
was overriding anything intended to be passed as $mode to always false
localization::getinstance