Updated invoice line item for MemberSet.
Remove type from entities list view in admin
Temporally trap the transaction aborted error
Temporarily trap error for group_refresh.
Removing prints in reports
New membership management command

Created a management command that will detect imported membership invoices and delete them.  This function was created because of duplicate invoices that were being created with membership imports.
Fix files search error on category and sub_category.
Refactoring the group add_user method to remove the try-except block.

Instead of wrapping try-except to the create, we test if user is already a member of the group.
Remove the temp code for error trapping from group_refresh.
Refactoring the is_member method in group for better performance.
"Hide Tabs" site-setting removed
Update position save in Stories to check for last.position being Null.
Error fix for get_payment_description for MembershipSet
New site_setting to show corp. mem. tab next to Users tab.
Pin version of createsend to 2.4.1
Wrap title tag in base with new block
Files search update.
Add full name filter to profiles.
Updating the "Approve Membership" feature.

Updating the "Approve Membership" feature.

In some cases the user object was not a user object.  This update prevents us this scenario from happening.
Squashed commit of the following:

commit 1b35218804811ebdf5b21fb6896be9acdcb7f1f6
Merge: 29d7e29 306e4f8
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 14:54:57 2013 -0500

    Merge branch 'refs/heads/master' into bixly-merge-ready

commit 29d7e29e4a7a0b12168c4078458318d0079ce39e
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 12:43:54 2013 -0500

    Added send_corp_membership_notices to the run_nightly_commands list.

commit fcc32bf9651c4f88832c2c574173e74b2765a124
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 12:39:24 2013 -0500

    Update send_corp_membership_notices to first check if there is any notice set up before proceeding.

commit 83d112eb5e2849a10c96d917640aabee737f18f8
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 11:55:45 2013 -0500

    Set default content type to 'html' and remove the 'text' type because the only content type it supports now is 'html'.

commit c492b8de9870f1d60e6a264a6f8c72d11b1eae6a
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 11:35:39 2013 -0500

    Perms update for corp renewal confirmation page.

commit 3af1a4b92e6a77d148a525d6e72aa59db50b31d0
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 11:33:14 2013 -0500

    Doc string update for send_corp_membership_notices command.

commit d4bf5d9ffd2f51169163cc02bb1672fbce01619d
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 10:00:30 2013 -0500

    Turn off HTML escaping for the corp notice subject

commit 169abfb2357a6ae4349165663c1e3b463c6c91d2
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Apr 4 09:42:05 2013 -0500

    Notice join_login_info update to avoid using RequestContext.

commit 745fc630df1ded9d6eb5a334ee6dcf450903d45f
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Apr 3 17:41:15 2013 -0500

    Update notice get_default_context.

commit 4dbf681d7d78538190a7b62cf77a7df4d228a92d
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Apr 2 16:28:32 2013 -0500

    Update fixture content for corp notices.

commit 06911cb119e7147c9a67b584bc41f2d1e837eaac
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Apr 2 09:40:23 2013 -0500

    Add 5 additional tokens to the corp notices.

commit a83340977e74015dbdd3a1e47ffcaec9641b31b9
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 1 17:55:23 2013 -0500

    Added back the notification corp_memb_renewal_approved in the case if the notice is not set up.

commit a97dfdfb715ec9d0f156bdb85b5e1dab97d9712c
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 1 17:46:54 2013 -0500

    Added back the notification corp_memb_join_approved in the case if notice is not set up.

commit 373cd4e2c3c6418b64aa9f0f57c64043db8899b2
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 1 16:19:26 2013 -0500

    Pass reply_to to the notification.send_emails only if there is a valid sender email address.

commit dba1990161fa9f9c5ac0c764277fb4cf20a2b039
Merge: c16b7f5 f416ece
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 1 14:10:11 2013 -0500

    Merge branch 'refs/heads/master' into bixly-merge-ready

commit c16b7f551b5b11f2530f4a0c88620819f5d3a72c
Author: John Eddie Ayson <je@bixly.com>
Date:   Sun Mar 31 08:49:35 2013 +0800

    #27: Added rep_first_name and renewed_individuals_list tokens

commit 41e6667c31380cc2c595bce06289f5c0c4c658e2
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 20:18:47 2013 +0800

    #27: Additional changes for corporate membership custom notices

commit 41812271a1c03dfbaf8862a764f45227419b8ada
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 08:00:21 2013 +0800

    #26: Recurring payments confirmation text

commit 3ae59b0f01ba8269dc685522c5bd0be55c6a0cd6
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 07:46:35 2013 +0800

    #121: Update Membership Reports

commit 8782e3f4ad98bb2834c935e69a9be4a4904a5660
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 07:36:58 2013 +0800

    #44: Additional changes to user merge

commit f30210f8a8647a29f4b2759d8107c9e6ee092610
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 07:02:11 2013 +0800

    #28: Add Profiles in django admin

commit 5a4f5eb78dcbd3c90cc7e0a32b308aaa2ba4dc7b
Merge: 4228be6 97fd469
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Mar 30 06:56:16 2013 +0800

    Merge branch 'master' into bixly-merge-ready

commit 4228be6eb6d103b7b06ffd440e387155063515bc
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Mar 27 19:06:42 2013 +0800

    #27: Custom notices for corporate memberships