Added DISCOUNT_DAYS_PER_SHIFT to settings.py
Merge branch 'master' into new_workshift_policies

Conflicts:
	mess/settings.py
A ton of changes for our new workshift policy

A quick summary:

 - For the purposes of this update, "Working Members" are members with a
   work status of "Workshift" or "Committee"
 - Working members now receive 31 "discount days" after successfully working a
   shift
 - The dashboard and member pages now reflect when a working member's discount
   will expire.
 - The timecard has been updated. No more Hours Worked. Terms have been
   renamed to reflect language of new policies.
 - When a working member's discount expires, the Member.discount
   property/function now returns 5 (as in 5% similar to non-working
   members)
Fixed bug in calculation of discount expiration date
Merge branch 'master' into new_workshift_policies
Fixed layout bug in member interest form
Membere interest form no shows open member and committee jobs
Very minor change to label in member an welcome template
Fixed another minor bug with Member.discount_expiration_date function
Merging conflicts
Merge branch 'master' into new_workshift_policies

Conflicts:
	mess/membership/models.py
Merge branch 'master' into new_workshift_policies
Mariposa Policy Handbook
Added new Member Policy handbook to MESS

Also updated landing page win a link to the handbook
Merge branch 'master' into new_workshift_policies
Updated metadat for policy handbook

Removed reference to Crossroads Music in
document title and updated author.
Added Unique Current Member Visits to transaction summary report
New Transaction Summary template with unique current member visits
Lots of changes for new working member policies

- Scheduling screen has been updated to support proxy member workers
- Members are now awarded a set amount of discount days
  per shift worked. As alluded to earlier, members may also now work
  shifts for other members on their account.
- The "Task" model has now been updated with two new fields:
  account_member and proxy_for. The member field is no deprecated.
- A new report has been created "Recent Unexcused Shifts" which
  presents a list of all unexcused shifts for each member in their
  recent history.
Merge branch 'new_workshift_policies' into django1_6

Conflicts:
	mess/templates/accounting/snippets/page_menu.html
	mess/templates/scheduling/schedule.html
	mess/templates/scheduling/snippets/page_menu.html
	mess/templates/scheduling/snippets/turnout.html
	mess/templates/scheduling/timecard.html