Updated the Readme
Modified Boxfile and the site.php file
Updated README
Added boxfile.install; renamed before_deploy to cli_installer.php
Refactored site.php
Disabled marketplace support in site.php
Added sitemap.xml symlink
Updated to 5.6.1.2 stable release

Squashed commit of the following:

commit ed8806bac9f055ee76dd22081ae09c5ccb0fd826
Merge: 5015017 f93de29
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 21 11:23:53 2013 -0700

    Merge pull request #969 from synlag/patch-2

    Update auto.js

commit 5015017cc3347d4319c78a34341b0617a066c0ba
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 21 11:19:56 2013 -0700

    page type name fix

commit 9c974efc1df2235576fab8e2552a0dcd1c07da1e
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 21 11:11:13 2013 -0700

    build js

commit 4a77c0c102ce8d0e10b486cf6d71550b10c02a1a
Merge: 7e0bec5 5724545
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 21 11:10:33 2013 -0700

    Merge pull request #991 from mkly/fix_body_scrollbar_disappear

    Fix Scrollbar on 2nd+ Dialog Open/Close

commit 5724545d2986a4db983b994746d792ee03d8c024
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Wed Mar 20 20:30:40 2013 -0700

    Fix Scrollbar on 2nd+ Dialog Open/Close

    Fix scrollbar on 2nd+ dialog open/close
    When two or more dialogs are open the `data-last-overflow` attribute is
    set to `hidden` as the first dialog sets body to `hidden`

    - Apply dialog count check

    open, beforeClose, ui-dialog, dialog, body, overflow, hidden

commit 7e0bec53a08e1fd8907e3e244e4fe66d9f75c669
Author: Andrew Embler <andrew@concrete5.org>
Date:   Wed Mar 20 16:08:24 2013 -0700

    updating version

commit 9a4b1d1a540d1c9b8d95db6ce00725c757a7f284
Author: Andrew Embler <andrew@concrete5.org>
Date:   Wed Mar 20 16:08:09 2013 -0700

    url slug update

commit 66b89e4adea78dc5796a1381b57e8c4dd1187595
Merge: 38678bf 0b8fd2f
Author: Andrew Embler <andrew@concrete5.org>
Date:   Wed Mar 20 15:20:35 2013 -0700

    Merge branch 'master' of github.com:concrete5/concrete5

commit 0b8fd2f4a0ba837dea40244128eda8e61dc07afa
Merge: 8a872b5 f3cf415
Author: Andrew Embler <andrew@concrete5.org>
Date:   Wed Mar 20 15:20:03 2013 -0700

    Merge pull request #990 from mkly/fix_parse_stylesheet

    Fix `PageTheme::parseStyleSheet()`

commit f3cf4159140ec1643f64ece26acb2f30999b3318
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Wed Mar 20 15:15:46 2013 -0700

    Fix `PageTheme::parseStyleSheet()`

    Fix `PageTheme::parseStyleSheet()` to use new
    `Environment::getUncachedRecord()` to be consistant with
    `View::getStyleSheet()`

commit 38678bfbc2a632e53315a6b4976e7c30a52a2403
Author: Andrew Embler <andrew@concrete5.org>
Date:   Wed Mar 20 11:38:44 2013 -0700

    quieter errors if page cache errors out in mkdir or unlink

commit 8a872b5bf3a8f36065e3158c338788a872ba324e
Merge: 5b0e277 7dbc852
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 19 09:41:58 2013 -0700

    Merge pull request #987 from mkly/fix_installer_cache_flush

    Check for Table and Column Before Changing

commit 5b0e2774e8991d236657908208e7be55962697d3
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 19 09:39:18 2013 -0700

    tweaks to environment and view

commit 7dbc852e3823164374a54fd4a81ce3697ceea6b6
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Mon Mar 18 17:42:25 2013 -0700

    Check for Table and Column Before Changing

    - Check for Table `CollectionVersionBlocksOutputCache` before `truncate`
    call
    - Check for Column `btCachedBlockRecord` before `set`

    Correct error while upgrading to 5.6.1 as `btCachedBlockRecord` does not
    exist

commit 9ac5b5413782d191b8c6b120a56761c0c89d93bb
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 15:01:15 2013 -0700

    more bug fixes

commit a7c323d0c57dec85a26ea2bc7b390c73e0c1adbe
Merge: 8267a20 c1f7e53
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 14:51:22 2013 -0700

    Merge pull request #985 from mkly/fix_overrides_cache_css_js_getstylesheet

    Fix `getStyleSheet` CSS File Retrieval

commit 8267a2083d3a5b54aedda792a5666ab2a34f05f9
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 14:40:47 2013 -0700

    adding flush to upgrade

commit c1f7e53cf2d151515d81e11770103a9c3f2b1e41
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Mon Mar 18 14:40:27 2013 -0700

    Fix `getStyleSheet` CSS File Retrieval

    Fix `View::getStyleSheet()` css file retreival

    `.css` files are not retrieved from getRecord so this always returns
    blank

    Change `Environment::getOverrides()` to cache all files not just files
    that end in .php

commit 0900e17de378e76adf1a4be5ce7db6ec46681aa7
Merge: 850f05d 1fe7563
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 10:18:01 2013 -0700

    Merge pull request #982 from mkly/fix_zend_cache_loader_library

    Change `require_once` to `Loader::library`

commit 850f05d7acf93cddc97a24877783aaeb2a3a3190
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 10:16:09 2013 -0700

    updating version

commit 3f1aa9dadf12966c52a083c69e128c7fe97c0b79
Merge: a784755 0da449e
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Mar 18 10:13:59 2013 -0700

    Merge pull request #981 from mkly/vet_composer_workflow_regression

    Vet Composer Workflow

commit 1fe7563967e0965cd20cdf4e628d747f48501c96
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Fri Mar 15 16:00:03 2013 -0700

    Change `require_once` to `Loader::library`

    Change `require_once` to `Loader::libary('3rdparty/Zend/Cache')`

    This allows for overrides when using with Zend

commit 0da449ec0f3b285b339fadd650a0255192eadc04
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Fri Mar 15 15:18:02 2013 -0700

    Vet Composer Workflow PR and Button Text

    - Vet composer worflow pull request
    - Make Publish button display "Submit to Workflow" when under workflow

commit 6b8958c748495c935f1abfff181da4357a2c533f
Merge: a784755 6c77063
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Fri Mar 15 14:39:45 2013 -0700

    Merge branch 'patch-21' of github.com:Remo/concrete5 into vet_composer_workflow_regression

commit a784755f26ace54d13a36165d9fb074a9553e036
Author: Andrew Embler <andrew@concrete5.org>
Date:   Fri Mar 15 10:27:52 2013 -0700

    fixing area permissions

commit a3f78b4814bad41eb5a9c1328f8b5e7579e69739
Author: Andrew Embler <andrew@concrete5.org>
Date:   Fri Mar 15 10:04:40 2013 -0700

    fixing blog rss

commit e7807ded2b4c4602739b5b8f3cf9ca426f1ea7c1
Merge: 59bb8f3 898be3e
Author: Andrew Embler <andrew@concrete5.org>
Date:   Fri Mar 15 09:42:33 2013 -0700

    Merge pull request #951 from mkly/bugfix_full_page_cache_headers

    Fix Full Page Caching to Include Headers

commit 59bb8f3b11b336bccfed00bba3e3d93064b426f8
Merge: 2d33d91 dd98943
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 16:30:31 2013 -0700

    Merge pull request #964 from mkly/bugfix_install_block_with_override_controller_bttable_dbxml

    Fix Installation Blocks w/ Overridden Controller

commit 2d33d919cf6ca065fad26b13f082b60b313ea209
Merge: e834cd1 b45a807
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 16:14:28 2013 -0700

    Merge pull request #972 from mkly/fix_urlify_empty_word_list

     Fix URL Removed Word List for Empty String

commit e834cd134c8a9f453550c69b4c57717787b1d081
Merge: 93ffb9a e5e8d59
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 16:11:44 2013 -0700

    Merge pull request #970 from mkly/fix_survey_block_divide_by_zero

    Fix Divide By Zero Error if No Votes

commit 93ffb9a6faa9bdcdb3ba7f4507add4a379547dc7
Merge: 66eff94 e5a5b77
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 16:07:06 2013 -0700

    Merge pull request #973 from mkly/fix_block_design_preset

    Fix Block Design Preset & Footer Buttons

commit 66eff94f739162d69c43e94f67908a9c33a76f1d
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 16:05:31 2013 -0700

    fixing child pages bug

commit eadc13022c9c8f468770e9e0112691bbe7fd3759
Merge: 6c7240c 1ea3b00
Author: Andrew Embler <andrew@concrete5.org>
Date:   Thu Mar 14 15:50:08 2013 -0700

    Merge pull request #965 from mkly/bugfix_fix_orphaned_children_in_workflow_delete

    Fix Orphaned Child Models in Workflow Delete

commit e5a5b77c6ce50c6ce7f0e5b65b356d827368e930
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 12 14:22:56 2013 -0700

    Fix Block Design Preset & Footer Buttons

    Fix block design preset switching and footer buttons on refresh.

    - `ksort()`'s option array so default(no custom) is first
    - Checks for `$_REQUEST['refresh']` before including footer buttons to
      prevent double set of buttons in footer

commit e5e8d5911813cc843e2ee53bce2493ee7f9a77c9
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 12 13:16:25 2013 -0700

    Remove `$value=0` From Previous Commit

    Previous commit incorrectly set `$value=0` and caused issue with graph
    rendering

commit b45a8077b6dde8d1afee6f4fead77b55f43a497d
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 12 12:58:53 2013 -0700

     Fix URL Removed Word List for Empty String

    Fix url removed word list of empty string.

    - Accounts for empty string
    - `explode()` should always return an array
    - filters even single string to account for multiple spaces
    - Remove `?>` from bottom

commit 360abcc562335dd131e64d5ff6c3ed40927f7c11
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 12 11:58:51 2013 -0700

    Fix Divide By Zero Error if No Votes

    Fix divide by zero error if no votes in survey.

    Possible future addition would be validation to prevent submitting form
    if not votes.

commit f93de29fc4da3f32ac04c5c4fe98999c35a3696c
Author: synlag <ron.nitzsche@gmail.com>
Date:   Tue Mar 12 19:23:25 2013 +0100

    Update auto.js

commit 6c7240cb1b011ebc4e5a27451f9024f576b1fadc
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 11:15:25 2013 -0700

    merging js

commit 1bb81f75c97a45a7daefbacb2b59806601ab112a
Merge: 6f61a49 34659c6
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 11:14:10 2013 -0700

    Merge pull request #962 from mkly/bugfix_quicknav_intelligent_search

    Fix Quick Nav Add/Remove Break Intelligent Search

commit 6f61a49d13ec9d76858de72a7a20c7aa0de1b597
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 11:06:53 2013 -0700

    tweaking cache key

commit e685515e2cbc5b2201bbbb521d5df0dda5ef9d3c
Merge: 48ae483 4fd6fa6
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 11:06:29 2013 -0700

    Merge pull request #961 from mkly/bugfix_file_versions_display

    Fix Version Display in Dashboard

commit 48ae48370cf45b3a3d7fbbbadc68ffed2637a5af
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 11:02:31 2013 -0700

    fixing file attribute properties HTML

commit e3315ccc9b8bbba9484da2332155c284d0ee88d2
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 10:40:12 2013 -0700

    fixing global block design problem

commit 0e750e7ce87b59d85448134409c0f8dca2af5ac0
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 09:52:46 2013 -0700

    fixing package block install bug

commit ce8bc3d798f6e40390bc74e883ab072283ef5a29
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 12 09:31:58 2013 -0700

    adding cache local clear to collection version record

commit 1ea3b00e89e810ab6bed871e6e585776167e3e60
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Thu Mar 7 09:37:45 2013 -0800

    Fix Typo in WorkflowProgress Model Call

    Fix typo from `WorkflowProgess` to `WorkflowProgress`

commit 73cd312efd292f073185649859ce283bfb1fe27e
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Wed Mar 6 22:06:14 2013 -0800

    Fix Orphaned Child Models in Workflow Delete

    Fix orphaned child models in workflow delete.

    Likely related to issue with workflow error if workflow in progress is
    deleted.

commit dd98943bb8c9eafef0375ef9a73a105840d9c537
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Wed Mar 6 16:12:43 2013 -0800

    Fix Installation Blocks w/ Overridden Controller

    Fix installation of blocks with overridden controller but not an
    overridden db.xml file.

    This caused an upgrade error from upgrading 5.6.0.2 to 5.6.1

    - Add additional parameter to `BlockType::doInstallBlockType()` to account
    for `db.xml` location.
    - Add check for `FILENAME_BLOCK_DB` as well as
      `FILENAME_BLOCK_CONTROLLER` as these could be different directories.

commit 34659c6ebe5364dea94c325cfd27675d6d8aaabb
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 5 16:48:01 2013 -0800

    Fix Quick Nav Add/Remove Break Intelligent Search

    Fix quick nav add/remove breaking intelligent search after clicked.

    - Add `this` to jQuery element data to access methods
    - Call `$.liveUpdate.setupCache()` after replacing intelligent search
      results.

    Needed to modify jquery.liveupdate.js as I could not find another means
    of modifying internal data.

commit 4fd6fa68b2e85deeb36ff3cbb8c3596cbf29fe0f
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Tue Mar 5 14:24:41 2013 -0800

    Fix Version Display in Dashboard

    Fix version display in dashboard view.

    `$this->fv` was storing on file version and caching that. This caused
    the same version as the first one to always be returned.

    Change to `CacheLocal::set()` `CacheLocal::getEntry()`

commit eaa385f24ec3db96f8c275a6bb1620af00f43803
Merge: f0df442 0260214
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 13:16:36 2013 -0800

    Merge pull request #954 from mlocati/patch-65

    Fix (again) for badly converted short tag

commit f0df442a982ec7dcf89a0b1c0f1ce14b72c59b63
Merge: bb1a883 7bf619f
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 13:16:12 2013 -0800

    Merge pull request #947 from jel3/patch-2

    removed "Loader" line, it is unnecessary

commit bb1a8832cab03bc80d717d907aa56545e7e44b78
Merge: d99610c 62e7de5
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 13:15:40 2013 -0800

    Merge pull request #953 from mlocati/remove-unuseful-file

    Remove unuseful file

commit d99610c9f585b062e5c5a790b8c9544931e8e425
Merge: 8492e83 748a6d2
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 13:14:25 2013 -0800

    Merge pull request #958 from beebs93/master

    Allow TextHelper to be overwritten by a package

commit 8492e83c42acf700ff01a35bf0b7bdbc0b560159
Merge: 87f56d0 5180bfe
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 13:08:12 2013 -0800

    Merge pull request #959 from mkly/bugfix_user_attribute_key_cache_return_value

    Fix `UserAttributeKey::getByHandle()` Return

commit 87f56d0ce2d20dfd585d97fdc22e5793fbb4e8d8
Merge: b9cc054 5600256
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 11:57:47 2013 -0800

    Merge pull request #960 from mkly/bugfix_layout_change_preset_footer

    Fix Extra Buttons on Layout Edit Dialog

commit b9cc0540df63c407adbca4578cdb4bb676ddd298
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 11:42:29 2013 -0800

    dashboard js build. reinstating loadversionobject default to fix bulk delete error

commit a21cd38dbf277233a2ba6cf2aca46da127c196f8
Merge: 71fa6e3 57964a4
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Mar 5 11:36:39 2013 -0800

    Merge pull request #949 from mkly/bugfix_dashboardjs_include

    Checks for Help Icon Before Calling `popover()`

commit 56002564f4431b63dccd324226276058692241d5
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Mon Mar 4 21:25:18 2013 -0800

    Fix Extra Buttons on Layout Edit Dialog

    Fix extra buttons layout edit dialog.

    Footer form buttons were being displayed even when
    `$_REQUEST['request']` was set and set to one.

    Checks for value before including footer buttons.

commit 5180bfea56ce40f92180e457ce61c54db2c29925
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Mon Mar 4 20:39:03 2013 -0800

    Fix `UserAttributeKey::getByHandle()` Return

    Fix `UserAttributeKey::getByHandle()` return value to return false if
    attribute key is not found. This maintains a consistent interface return
    value as prior to change the first call before caching will returh -1
    while following requests will return false

    See
    http://www.concrete5.org/developers/bugs/5-6-1
    /userattributekeygetbyhandle-returns-1/

commit 748a6d2c984542def85d1dc0c00dcbeed4fb8a99
Author: Brad Beebe <beebs93@gmail.com>
Date:   Mon Mar 4 16:48:27 2013 -0800

    Allow TextHelper to be overwritten by a package

    Fixes bug described here: http://www.concrete5.org/developers/bugs/5-6-1/cannot-override-texthelper-via-custom-package/

commit 026021449eb0003205e4c34c88198311ed5899cf
Author: Michele Locati <michele@locati.it>
Date:   Mon Mar 4 17:42:04 2013 +0100

    Fix (again) for badly converted short tag

    This was already fixed, but commit #d2ac28e364fb1e0d464b1719f2f3fb30edd54f1e reintroduced this.

commit 62e7de5a6db59f73ffdf2a56e417926f3957094b
Author: Michele Locati <michele@locati.it>
Date:   Mon Mar 4 16:47:15 2013 +0100

    Remove unuseful file

    I don't think this .bak file should exists...

commit 898be3e061198b3709df73ab7706536238213014
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Sun Mar 3 12:28:42 2013 -0800

    Fix Full Page Caching to Include Headers

    Fix full page caching to include headers in `PageCacheRecord`

    - Add method `PageCacheLibrary::getCacheHeaders(Page $c)`
    - Refactor/DRY `PageCacheLibrary::outputCacheHeaders(Page $c)` to use
      `PageCacheLibrary::getCacheHeaders(Page $c)`
    - Add method `PageCacheRecord::getCacheRecordHeaders()`
    - Add method `PageCacheRecord::setCacheRecordHeaders($headers)`
    - Set cache header record in `PageCacheLibrary::__construct()`

    Design goal is to avoid changing the interface as I'm alread aware of
    one page cache(for Redis) in the wild.

    Slightly inefficient as it calls `PageCacheLibrary::getCacheHeaders()`
    twice when caching a page.

commit 57964a4e2d9dca94874c6daab62db1d4006ddc6f
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Sat Mar 2 13:01:15 2013 -0800

    Checks for Help Icon Before Calling `popover()`

    Checks for help icon `#ccm-page-help` before attaching
    `$(document).click()` event

commit 7bf619f93bba2eeb9e34fc288651124d9d7e57e5
Author: jel3 <jelthure@gmail.com>
Date:   Thu Feb 28 23:16:08 2013 -0500

    removed "Loader" line, it is unnecessary

    removed "Loader" line, it is unnecessary because class extends a class which loads it

commit 71fa6e373447abcb61a3519b23eca9a701dad592
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Feb 19 14:15:33 2013 -0800

    body overflow bug fix

commit 2b9a3d38ee817fb1e029b44d5b2b73a212fbc30e
Author: Andrew Embler <andrew@concrete5.org>
Date:   Tue Feb 19 14:01:18 2013 -0800

    fixing potential bugs

commit 2d25e91335972a0c89125b407e9062e66494e4a1
Merge: ca7cc07 8958684
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Feb 18 13:49:02 2013 -0800

    Merge pull request #927 from aghouseh/master

    image helper enhancement bugfix - updated property name in the prefix addition

commit ca7cc07554e0f038a74ca35ec11c7ab9503b8010
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Feb 18 13:20:18 2013 -0800

    fixing block permissions in area names that had spaces

commit 76b8b085bca414cc9b4f9516a5b5ebcf8f24db10
Merge: 4086fd3 b0e1c9a
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Feb 18 13:20:10 2013 -0800

    Merge branch 'master' of github.com:concrete5/concrete5

commit 4086fd338e2fad944cd9246ae9a9c6ec2409a930
Author: Andrew Embler <andrew@concrete5.org>
Date:   Mon Feb 18 13:14:51 2013 -0800

    fixing block permissions in area names that had spaces

commit b0e1c9a1b4927bc36f94c3f6669998739d0dd3c8
Merge: 1acb315 f6ea765
Author: Ryan Tyler <rtyler@marverde.net>
Date:   Mon Feb 18 10:11:17 2013 -0800

    Merge pull request #931 from mkly/fix_bad_grammar

    Fix Bad Grammar

commit 6c7706353bc293045adf869a685f6dfca4cad6d7
Author: Remo Laubacher <remo.laubacher@gmail.com>
Date:   Mon Feb 18 13:51:25 2013 +0100

    publish composer changes

commit f6ea7657cc82a116fd62fe1035281225b8d6eb33
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Fri Feb 15 15:56:02 2013 -0800

    Fix Bad Grammar

    Change You're to Your in user_registration_approval_complete template

commit 1acb315c18d4daac3a7172dd554f1eba74abdcf6
Merge: 11fb86c 70037a9
Author: Ryan Tyler <rtyler@marverde.net>
Date:   Fri Feb 15 11:22:42 2013 -0800

    Merge pull request #929 from mkly/feature_user_approved_notfication

    Add User Notification Upon Approval

commit 11fb86c05119f27ac294ec5c1e06ef4a4cf9d8ec
Author: Andrew Embler <andrew@concrete5.org>
Date:   Fri Feb 15 10:59:10 2013 -0800

    fixing page permission cache identifier bug to correctly identify when to use permission collection id; making 5.5.2.1 upgrade to 5.6.1

commit 70037a9b50de75bda22301821b1b4cc02eb5a932
Author: Mike Lay <michael.lay.email@gmail.com>
Date:   Fri Feb 15 10:49:00 2013 -0800

    Add User Notification Upon Approval

    Add user notification upon approval/activation

    - Uses same logic as registration email to determine from address
    - Refactor of various registration templates for readability
    - Refactor of various registration tempaltes for HTML multipart

commit 89586847ad24234082cfc7b177735bcdbea98f85
Author: Andrew Householder <aghouseh@me.com>
Date:   Thu Feb 14 22:20:52 2013 -0800

    fixed old property name in the prefix addition
Updated readme
Merge branch 'pagoda-extras' into test_merge

Conflicts:
	README.md
	web/concrete/core/libraries/page_cache/library.php
	web/config/site.php
Added auto-creation of database if running locally (easy setup for development)
Cherry-picked readme from pagoda-extras branch