approve_membership perm, south workaround, allow_view_by update
reduced queries on edit_perms page
reduced queries on membership search results, memberships in user menu
reduced queries
Merge branch 'master' into 370_permission_to_approve_membership
search updates for entries search and filter ovverride to simulate admin perms
user_top update for membership
Merge branch 'refs/heads/master' into 370_permission_to_approve_membership

Conflicts:
	tendenci/addons/memberships/managers.py
	tendenci/addons/memberships/templates/memberships/details.html
	tendenci/core/perms/utils.py
	tendenci/settings.py
Merge branch 'master' into 370_permission_to_approve_membership
Merge branch 'master' into 370_permission_to_approve_membership
added approve permission to membership default
added checker for approve permission
Merge branch 'master' into 370_permission_to_approve_membership
#40: Member reminders
Squashed commit of the following:

commit 25cdba2b759ef05fdb673e318c76c4bc1e345837
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed May 29 16:59:37 2013 -0500

    Updating start date on membership archive list on detail page

    Showing renew dates on list of archived memberships before showing the join date.

commit d0a3079c5206671557e049a3881c6eb66f95ab62
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed May 29 11:09:21 2013 -0500

    Reordering filters on admin membership list page

commit 60a3e4a29f1e3b27f53f550b190b54cb3540fca0
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed May 29 10:22:45 2013 -0500

    Removing 'archive to approve' option in memberships

    Removing this option from the membership detail page.  If a membership is archived then another membership record will via available via the profile that will allow you to change the status of a membership.

    Archived memberships cannot be changed.

commit 4f40d784c2e8a3d374084af309e3c51e449d695c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed May 29 10:02:18 2013 -0500

    Removing commented-out fields on MembershipDefaultAdmin

commit 0dd6aa4764f333ef2c6affa821448fe948398c43
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed May 29 10:01:29 2013 -0500

    Not overwriting the queryset method on MembershipDefaultAdmin

commit a31b67f9a1cfdb6521d4ac9076b5573830ec8658
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed May 29 09:36:50 2013 -0500

    Moving resumes to the TendenciBaseModel. Adding search text template.

commit fbfa020c2201a21e0bd47afdec9c82524474f336
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue May 28 16:31:43 2013 -0500

    Version bump

commit b0dab4c94a27dcbf471835519eb823596cfbfdfa
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue May 28 16:31:48 2013 -0500

    Updated indexing for articles in whoosh.

commit 6198b0eaea910e88d12bc7d7d9168cd7d4729a7c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue May 28 15:48:39 2013 -0500

    Adding uploaded to photo detail page.

commit 36522876fa84bbbbf2405e341b13f32659b72581
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue May 28 16:10:27 2013 -0500

    Update function create_member_number to use the setting MemberNumberBaseNumber

commit 56dba6744a4f084ee716142f1635dfc252652c5b
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue May 28 16:07:29 2013 -0500

    Add default_value for setting MemberNumberBaseNumber

commit 6a24a7d981f98f4395ddaf866f9300ee4669a8d7
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue May 28 13:37:43 2013 -0500

    Update is_expired to make sure expired means expired and not in grace period

commit c8a2508e102c187afdb7f045a18d63ba2605601e
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue May 28 13:34:23 2013 -0500

    Add a membership setting MemberNumberBaseNumber

commit df02b9f27cfa22baf16a0a3d3ce3bb904247c3bf
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue May 28 15:24:06 2013 -0500

    Changing namespace passed on PhotoBatchEditForm.__init__ method

commit 77c0b26e6341d5c89de05bd4ff43d4d4ad2b194d
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue May 28 15:16:19 2013 -0500

    Changing the way we detect the "delete" checkbox on photos bulk edit

commit 437a72a90b634dfc8bedf268b8def65edd6f59bb
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue May 28 12:52:42 2013 -0500

    Updating is_expired and in_grace_period method in MembershipDefault

commit a195dbe28310eec728c73f166128043365168509
Author: Ed Schipul <eschipul@schipul.com>
Date:   Tue May 28 06:52:43 2013 -0400

    Update README.md

    Added link to ova download and demo site which both came up in phone calls this week.

commit 306b2114cb2571c18590b4e807eb29721df6bf2b
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri May 24 16:55:48 2013 -0500

    Update the get_membership_type_choices to resolve the issue about logged_in users not being able to see membership types on membership join

commit 662afcdbec73c65657c2a0592f91ce04edc06a8d
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri May 24 15:54:53 2013 -0500

    Update reminder message to append time to the renewal_period_end_dt

commit f010fe8096b7d633610679cf8eaf6f8ce6ef6f28
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri May 24 15:42:16 2013 -0500

    Squashed commit of the following:

    commit 42344c918e9868afbcd1d957f682b256c38bdc43
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri May 24 18:47:31 2013 +0800

        #40: Member reminders

commit e1a46c5b18b14f2dd3e7d3de88b9b65f2521ecf3
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri May 24 13:10:37 2013 -0500

    Default new added Reports to filter out estimate invoices.
#405: Add feature to generate html newsletter content without campaign monitor
#397: Update invoices search to be database only
#122: Complete the model reports for invoices
#18: Allow big files to get uploaded via the files module
Use inexact on bill_to fields