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.
tweaks to composer
Enhanced the image helper to allow for instance-specific JPEG compression level

I felt there was a need for the image helper to occasionally render
very high quality JPEGs (my usage was a zoomable map), and there was no
functionality to do this on a per-image / -block basis. Should be a
fairly straight-forward upgrade.
Enhanced the image helper to allow for instance-specific JPEG compression level

I felt there was a need for the image helper to occasionally render
very high quality JPEGs (my usage was a zoomable map), and there was no
functionality to do this on a per-image / -block basis. Should be a
fairly straight-forward upgrade.
Structural updates based on best practices and feedback

# Renamed the compression property to jpegCompression to be more
consistent. also set default value to default system value
# moved constructor to the reset() method which is automatically
invoked by Loader::helper
 # returned $this on setJpegCompression method to allow for chaining
(e.g.
Loader::helper('image')->setJpegCompression(20)->getThumbnail($file,
200, 100);
# modified min level to be 0 per imageJPEG method's acceptable range
Structural updates based on best practices and feedback

# Renamed the compression property to jpegCompression to be more
consistent. also set default value to default system value
# moved constructor to the reset() method which is automatically
invoked by Loader::helper
# returned $this on setJpegCompression method to allow for chaining
(e.g.
Loader::helper('image')->setJpegCompression(20)->getThumbnail($file,200,
 100);
# modified min level to be 0 per imageJPEG method's acceptable range