Squashed commit of the following:

commit a9978c6ad82c94cf0d944e13875177900cb0cf8a
Author: Jenny Qian <jqian@schipul.com>
Date:   Sat Oct 13 18:32:46 2012 -0500

    Minor update for creator and owner assignment.

commit 3b1420f8d05c80404024afbef2943457c0fb616e
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 21:29:44 2012 -0500

    Include 304 to the response code.

commit 38b779c92db3abd2756d951e261cb4a155fb201e
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Oct 12 18:19:40 2012 -0500

    Maybe cache the photo when we upload? It slows down uploads but speeds up the batch edit view afterwards.

commit d52f5f4ca96ddc670ce717794257f0152011b68b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Oct 12 17:47:10 2012 -0500

    Adding entity to be excluded from membership application.

commit 41547a158283856ce933aa06a3b7629bc57732c0
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 15:07:02 2012 -0500

    Added the option src_url.

commit 22653662e96fb2020818f7f043698fdddd1e00b1
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 14:51:38 2012 -0500

    Added doc extension.

commit 849d1c3a3257206427107628cdc0c5bd17125da9
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 12:13:22 2012 -0500

    Update management command scan_and_retrieve_files. Allow app names to be passed from command line.

commit e48fc0180473d2c605d825d8183cc282e171c088
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 11:46:50 2012 -0500

    Rename management command scan_and_retrieve_files.

commit b20e26ae5cee897ecb4129e2219debd18b1c765e
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 12 08:41:31 2012 -0500

    Management command to fix broken images by retrieving from its original (T4) site.

commit b5a8ca03d10b73fc6c6efbe8f476a34982f39c62
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 11 18:29:05 2012 -0500

    **Files: Adding group on file add/edit pages. Added files_list tag to be pushed out to the site. Updated files search page to include filter for Group.

commit c10cf4c3dbc759cec95149cdf1aa6143964d5115
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 11 18:27:44 2012 -0500

    Updating base template tag for lists to allow group to be passed as a kwarg.

commit bb89ec5f0f7d3c87fc466f845d12ef3c11415060
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 11 18:27:19 2012 -0500

    User groups: reorg the import for ImportFile to not conflict with File on imports.

commit 92ce6fd123c23ac1002703230c223618bade9eaf
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 11 18:26:49 2012 -0500

    **Photos: Adding group edit on bulk edit and individual photo page. Updating photos_list tag to take in group.

commit 58c15bc8f95cb094757d261a662539c4cf0ba3a7
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 11 18:25:51 2012 -0500

    **Events: Adding group to be displayed on Event add/edit. Adding group to the filters list for the list_events tag.

commit 66d69a92c93dfe75ae02920fdd119dbdb1e2dbba
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Oct 10 21:30:10 2012 -0500

    Minor update address assignment.

commit 60452d75dca89c17cf40510e5677c92f26b2afd3
Author: Ed Schipul <eschipul@schipul.com>
Date:   Wed Oct 10 18:13:56 2012 -0500

    Entity added to admin section

    Added entities and associated with groups and parent entity id

    Signed-off-by: Ed Schipul <eschipul@schipul.com>

commit 29179d7adaddefc963591e05b4a199edd231c8f9
Author: Alex <aragsdale@schipul.com>
Date:   Wed Oct 10 15:41:09 2012 -0500

    Removing duplicate forms templates.

commit fdcd7a89085a69941b7e0d5ffe1cce7b097ca2fc
Author: Alex <aragsdale@schipul.com>
Date:   Wed Oct 10 15:40:53 2012 -0500

    Custom templates for forms.

commit b4d4f7c0c83472489f77f5fde04b1730bf4f4108
Author: Alex <aragsdale@schipul.com>
Date:   Wed Oct 10 15:39:04 2012 -0500

    Pages: check for template with template_exists so that custom page templates work.

commit 4d9c40647df21d138fffbaeb8c84dcc3e031cd6a
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 10 12:31:48 2012 -0500

    Accountings: Add group by description in SQL.

commit eb0162f24c7992ce16573dca31e353297212e2fa
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 10 12:11:02 2012 -0500

    Add new management command to be run nightly that is a collection of other commands.

commit 6b54b603de45ebc44db241364b9b668654f257e0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 18:21:38 2012 -0500

    Add en url redirect to login page for legacy site compatibility.

commit f29e264b7cae28216fad7af3a24435adc0207aad
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Oct 9 22:14:15 2012 -0500

    Rename address to address1 for paypal form.

commit 09e1ab0f2b05bc8e2f2804c1178d595a550c67f3
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 18:08:21 2012 -0500

    Updating the theme editor to allow uploaded images.

commit 5e9f345c628f434647d8a84f886812d8c73326f1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 17:18:45 2012 -0500

    Updating events image field to save properly for S3 storage backend.

commit fb88763fa70a036eff891e67c12a000601488646
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 16:26:22 2012 -0500

    Updating index search template.

commit 078c6ceb30aeeed4d5f4f11a3d0b50fae4e5b8d2
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 16:25:57 2012 -0500

    Updating event_logs PNG generation.

commit 19f755357f53bd7199064b917cb71b68d3e31a5e
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 13:29:59 2012 -0500

    Updating split_title to check self.title before splitting.

commit 47113372b9f6b274952b5968aa1a9f859806e675
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 9 12:56:40 2012 -0500

    Updating user groups save to create or update the associated auth group.

commit ab3d3bba4c3dcfbf2384f558c92413f5674f3980
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 8 17:06:21 2012 -0500

    Updating the theme root path for a custom page template.

commit b260d242dd5b179555c307fc14f851393a7e0f93
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 5 17:40:55 2012 -0500

    Comment out the address info assignment - they are not returned by PayPal.  Update the response_reason_text.

commit 79c58577c9a5977f9adfaf6fe71ffe901d3e07f7
Merge: 6e87dac f15d9c6
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 5 17:19:44 2012 -0500

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

commit 6e87dacdc61f692fb45c62fcda1e590b9f630048
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 5 17:19:14 2012 -0500

    Handling payment process for papal PDT and IPN.

commit f15d9c6ff8a59672df12dabfb233503b6ec874bb
Author: Alex <aragsdale@schipul.com>
Date:   Fri Oct 5 14:14:11 2012 -0500

    Directories: added notice says Directory in the title.

commit 1ff7a3a56790b137a627d54e18a93ec0f0bf0e5f
Merge: 6e25cff 54f2ac3
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Oct 4 16:31:00 2012 -0500

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

commit 6e25cff9110068280cbc5520a5da5b33d96cccdb
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Oct 4 16:30:23 2012 -0500

    Fix the get_template_list to display templates when using S3.

commit 54f2ac37f81032563389676ac199dd70802c5e2e
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 14:36:11 2012 -0500

    Write out the file locally and only copy to S3 if necessary. The save to S3 reads from the local file, so we need to save it first.

commit cd44a02a6797d3137f7e8997a3adabec52030f6b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 14:17:19 2012 -0500

    New setting USE_S3_THEME to determine if the theme should be read and cached from S3 or read locally. Pep8 some of the files involved.

commit 82945ec4f7f8b9fa22c601a7b599ef31ac315306
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Oct 4 12:47:16 2012 -0500

    Start integrating paypal payment standard.

commit 6786c31f57f7ed3a1d79c4e8b968d39951d7e084
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 10:05:08 2012 -0500

    Reactivating the REMOTE_DEPLOY_URL

commit 6e5164eb52e98fb29ff779c004aa475a151348be
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 01:32:23 2012 -0500

    Comment out customize more templates, fix some javascript errors, and add a confirmation box on deleting a theme file.

commit caead6a613b38641d62c3fc8379e2edad15a7308
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 01:20:59 2012 -0500

    Handle the case where a theme file exists locally but not on S3.

commit b36a435d81dd499bc7b1fb16488d5918f7a72f7e
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 01:08:58 2012 -0500

    Clear theme template file cache on save, and load theme file contents from S3 when using S3.

commit db701aadf2987ae078a69243adbc7df206fde29d
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 00:46:40 2012 -0500

    Revert "Temporarily comment out the theme editor to continue testing."

    This reverts commit 9c4424fcb581bc1f80422c74a924addfcb1cced5.

commit 8ce20df424bb0cf883e85822c3f61d5b3c3572bb
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 4 00:46:29 2012 -0500

    Caching of theme template content to increase speed when reading templates from the theme editor.

commit 9c4424fcb581bc1f80422c74a924addfcb1cced5
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 3 23:18:33 2012 -0500

    Temporarily comment out the theme editor to continue testing.

commit aedd11bc8e1b63520f83332a254868c07fd78194
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 3 15:01:26 2012 -0500

    Excluding description and header fields from displaying in the email.

commit 267c657557b7b0d0cfc33982fd295818d4934a95
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 3 14:48:32 2012 -0500

    **Forms: Updating description and header fields to import the widget from the new tendenci.apps. location.

commit 44a9ca0e74c56ea52291ff9c8f6ba993d28bb64b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 3 10:44:52 2012 -0500

    Adding constrain to the image_cache_key

commit 972ab414632374891fd2270e62e6b618e08b1069
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Oct 3 10:17:52 2012 -0500

    Fixed a bug to resolve the size for remote images.

commit c78809beb2d341a0807fbff08377cc3a7010eacf
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 22:56:20 2012 -0500

    removing allow_anonymous_edit from form and event cloning views.

commit 0574105bd8bf7b8d4c84a12b69e20b0c4d531cbc
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 22:24:24 2012 -0500

    Allow null on attributes in the Base Search Index class for creator and owner.

commit bdac16a8860c642151b64ea2db1988eff756108a
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 21:57:04 2012 -0500

    Remove allow_anonymous_edit field from exports since that field has been removed from the base model.

commit e43b22725745b825597bc0b8e51875e068b26c56
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 21:19:09 2012 -0500

    Add file caching and file pagination back.

commit e2551a51fa5a40d99548859482332906483dd005
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 17:34:23 2012 -0500

    Reordering files urls.

commit a06c120a4ecc8c5caccb83e7869e7e4fe7f3cf39
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 14:01:13 2012 -0500

    Adding the import for the Decimal in base filters.

commit 3824f0ed1820aac7469d2f83f34387156b8a2460
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 13:42:44 2012 -0500

    Updating filters for file sizes.

commit 7b8b688eecaa23e2b44b9e3b17328a277789fe1a
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 10:17:04 2012 -0500

    Removed creator_id and owner_id data from initial nav data migration.

    Removed initial creation of an admin user. It is no longer needed since creator and owner allow null's.

commit 613641097d066a0e417fcf88c6b862476706b0b2
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 10:12:25 2012 -0500

    SET_NULL for versions on User delete.

commit 639e1683e03ed9d8d6b1170358374a43a0556a21
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 2 09:09:41 2012 -0500

    Added to the Pages save method to properly update S3 permissions for the header image based on the permissions of the page.

commit e9f41bab49e93c6daac9adc217a5cfe65ef37fe0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 1 19:42:47 2012 -0500

    Update plugins. to addons. when looking for settings from update_settings.

commit 4bc618e88a95af9d0094779dd42f5eac1dae3572
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 1 18:16:40 2012 -0500

    Updated files urls to handle reverses better for non-download and non-resized images.