Merge pull request #1263 from mlocati/widen-multiupload-button

Add a bit more space for SWFUpload button text
Merge pull request #1259 from synlag/patch-8

Let developers override more core pages by theme package
Merge pull request #1317 from ojalehto/refactor/blog-entry-page-type/date-format-and-translations

Changed blog_entry page type to use defined dateformat and correct translation string
Merge pull request #1323 from mlocati/fix-datetime-validation-bugfix

DateTime attribute: fix validation
Merge pull request #1324 from jackobear/deleteblock_mysql_escape

Fixed mysql escape in deleteBlock function
Merge pull request #1325 from aghouseh/fileset-populate-files-honor-display-order

Updated FileSet::populateFiles() method to pass an ORDER BY clause to ...
Merge pull request #1327 from patrickheck/patch-16

Use date constant instead of literal
Merge pull request #1338 from mkly/fix_page_decrement_wrap_around

Fix Negative wrap around in page parents
Merge pull request #1335 from mlocati/fix-user_export-charset

Fix charset of exported users list
Merge pull request #1339 from ojalehto/refactor/profile-messages/defined-date-format-usage

Change profile messages to use defined dateformat
Merge pull request #1334 from mlocati/patch-3

Localize permission key name in bulk add/remove page permissions
Merge pull request #1341 from ojalehto/refactor/base-config/use-predefined-constant-for-block-types

Use predefined constant when defining directories for block types
Merge pull request #1344 from hissy/content-block

use text helper instead of htmlspecialchars
Merge pull request #1345 from aghouseh/select-attribute-type-form-js-error

resolved deprecated function call onkeypress
Merge pull request #1331 from mlocati/patch-1

Fix creation of delete_file_set permission key
Merge pull request #1333 from mlocati/patch-2

Adding new permission key access_user_search_export without localization stuff
Merge branch 'fix_deleted_admin_group_5622_upgrade_fail'

Conflicts:
	web/concrete/helpers/concrete/upgrade/version_5622.php
Merge pull request #1353 from mkly/fix_on_render_complete_install

Remove on_render_complete from upgrade
Merge pull request #1347 from mkly/add_submissions_link_to_readme

Add link to code submission guidelines page
Merge pull request #1354 from mkly/add_job_queue_size_constant_and_change_to_ten

Add Job Queue Batch Size Constant Defaut to 10