Squashed commit of the following:

commit 459453c3725e25859eebc7756dffeb6a75d30a34
Merge: 62a01c9 e5e7fce
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Apr 17 16:46:09 2013 -0500

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

commit 62a01c94ba32275a69719b5e83cc2041ef525d53
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Apr 17 16:45:13 2013 -0500

    Updated the membership stats report with links to the lists of memberships for every membership type and membership status.

commit e5e7fce87e6fce069a02891c3d73b9aa9f7e068c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 15:44:32 2013 -0500

    Update version and update-tendenci-project to remove pyc's from conf folder.

commit a9231c414ebab83004bbc1b867ba5b77df968cb1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 15:25:32 2013 -0500

    Update corporate membership pricing description for case of no admin fee.

commit c5f9db22df242a10d82ba057899b3ab58c991690
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 14:33:52 2013 -0500

    Update image ordering in photo sets.

    Updated models, edit screen, and added migration for setting position. Added additional info in pagination section of detail screen.

commit 1823d82e0e664ec48cb24177381270cbca104759
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Apr 17 13:23:53 2013 -0500

    Update get_unique_username to truncate username if too long.

commit d07ef6a4d267ed5464e4caabf40b58682d02a1b7
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Apr 17 13:16:34 2013 -0500

    Changed registration logic to allow super users to register for any price.  This includes super users who are not members and not in required groups in order to register for an event price.

commit f8690e0fefd2e3efdc4ab423a163769818f48360
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 13:00:28 2013 -0500

    Update report link in admin_top. Update link to report on report list.

commit 1371fa28e385a20d53f7c12dd09a6ee0704e182d
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 10:41:31 2013 -0500

    Updated ordering for app_fields to use position.

commit 126309d6fc8a451a9e154b48189e09ccc64f7b6c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 17 09:50:45 2013 -0500

    Updating mirrors for pypi.

commit ebe91b5a640df11e9f21665cfd293c4d17a2e413
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Apr 16 17:24:42 2013 -0500

    Set include_package_data to True in setup.py

commit b833c93ac3ab50faffcca6231b84b73883b1f6e4
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Apr 16 17:24:42 2013 -0500

    Set include_package_data to True in setup.py

commit 769daa12c275b37ef0c38059c1cd13eb83c08077
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Apr 16 16:51:52 2013 -0500

    Corp. roster update for show all toggle.

commit 1c9a49f307ab96de9506bc89ff5ddb01caca9da9
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Apr 16 16:08:17 2013 -0500

    Default to the group with entity id=1 for the group dropdown on event add.

commit a15cf9b736932cea3b81b091667391d700eea8f8
Merge: 9bd0004 cab267c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Apr 16 10:57:57 2013 -0500

    Merge branch 'refs/heads/460_membership_discounts'

commit 9bd000434c38e375e00ba0d7cce68e1f9ef459ee
Merge: 8f755f8 bb5a50e
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Apr 16 10:54:07 2013 -0500

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

    Conflicts:
    	tendenci/apps/profiles/admin.py

commit 8f755f826bc0ea6f333d455611b5dcf76289c6a2
Merge: 8e2521f 88b19ca
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Apr 16 10:16:13 2013 -0500

    Merge branch 'refs/heads/createsend_31_fix'

commit 88b19caec496aaad9ae8d5fd225ce747b3ece983
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 15 17:56:02 2013 -0500

    Pep8 cleanup

commit 8aa74142c2320f7bf21be0370b3d13cde9bca4f3
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 15 17:39:27 2013 -0500

    Campaign monitor signals update.

commit 1644ec846d242c485b2b5620813459c794c7d557
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 15 17:02:05 2013 -0500

    Update campaign monitor to work with createsend version 3.1.0

commit 0ca7703ae712d1ab72f4efd8e4aedf1c9a6863e9
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Apr 15 16:51:14 2013 -0500

    Fix an error for sync_templates when called from the command sync_campaign_monitor with no arguments.

commit 8e2521f4c79b297c787f1f93e73bfcb5fb000b91
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Apr 15 16:05:03 2013 -0500

    Split full name field to first and last on expired members csv.

commit cab267ca8bc203cc3a0a4da50e719cbf88eb23fd
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Apr 15 22:05:12 2013 +0800

    Added discount_amount and discount_code to invoice model

commit eda5a51e23eed9520f2e884b391e758ebf9940f9
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Sun Apr 14 21:49:51 2013 -0500

    Adding the user module text file.  No content added yet.

commit fafbdb8aecece22429fb779fc3615e4a175059d3
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Sat Apr 13 06:45:10 2013 -0500

    Adding more membership documentation

    Adding information about the membership application module.

commit 285f096bc11e799df6a2dbf1c4995fc6bff8dadc
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Apr 12 22:15:05 2013 -0500

    Adding more membership documentation

    Describing what a membership type is and fundamental concepts about membership types.

commit bb5a50ea65138f515241f37aab76c886cb8215de
Author: John Eddie Ayson <je@bixly.com>
Date:   Sun Apr 14 09:07:54 2013 +0800

    Updated profile admin page

commit 316764b361bed5748dab933d68e77b7287e98eb6
Merge: ec696c4 4a0e21e
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Apr 12 15:32:02 2013 -0500

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

    Conflicts:
    	tendenci/addons/corporate_memberships/__init__.py
    	tendenci/addons/corporate_memberships/admin.py
    	tendenci/addons/corporate_memberships/forms.py
    	tendenci/addons/corporate_memberships/models.py
    	tendenci/apps/profiles/admin.py
    	tendenci/apps/profiles/templates/profiles/nav.html

commit ec696c4a9fef8bdf531f941965c7b9fae9ba4932
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 10 12:42:28 2013 -0500

    Updating ordering in the profile admin.

commit 45bb9d5e0aac6848adcc0cdb7f6b0c4669f57927
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Apr 10 12:35:26 2013 -0500

    Updated profile admin.

commit 46573612c4b4463aae3057f82aeb4862bc2e8947
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Apr 10 19:23:21 2013 +0800

    Updated discounts to membershipset instead of membershipdefault model

commit be6fb776644c014c8c670fdf27279de6d3f98c41
Merge: adae099 3c7d6b4
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Apr 10 17:17:09 2013 +0800

    Merge branch 'master' into 460_membership_discounts

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

commit adae099eb348be3451684c4f9369b071cfcc3482
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Mar 12 18:03:07 2013 +0800

    Updated migrations, and added fixes

commit 1bf5de3db1ee854bb4c4f40a37247ace3e18ef7a
Merge: 9fe4f98 c7b16f2
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Mar 12 17:31:16 2013 +0800

    Merge branch 'master' into 460_membership_discounts

commit 9fe4f9852399345b1d76a27ab953d398f69b0b8e
Author: Alex <aragsdale@schipul.com>
Date:   Thu Jan 24 09:24:15 2013 -0600

    Default discount_eligible to false.

commit e38eb995e0934b27af9f724fa2a938811f4022f2
Merge: fff5ecf 396882d
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Jan 23 07:11:27 2013 +0800

    merged with master, fix error for undeclared fields

commit fff5ecf789e7defa20f25e30e52bf0122d4689af
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Jan 16 21:35:31 2013 +0800

    fixes

commit 4d56a69523a9d681ab94a6ab1275c9da027c8727
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Jan 16 21:22:40 2013 +0800

    added discounts to memberships