Import style change from live site.
Export list of members with lazzzor privileges.
Unspecified changes to the cellardoor design.
Add price multiplicator to lazzzor list.
Fix typo.
Update link to MOS source.
add generic payment import for csv files
Make path for announce.log a setting.
Remove copyright notice from base template and fix alignment.
Initial factory_boy and python-faker integration
Merge branch 'django_1_4_compatibility' of git://github.com/Metalab/mos into django_1_4_compatibility
Change django requirement
Update middleware settings for Django 1.4.
Merge branch 'django_1_4_compatibility' of https://github.com/Metalab/mos into django_1_4_compatibility
Correct django version requirement again
Merge branch 'master' into django_1_4_compatibility

# By Christoph Schindler (6) and root (3)
# Via Christoph Schindler
* master:
  Remove copyright notice from base template and fix alignment.
  Make path for announce.log a setting.
  add generic payment import for csv files
  Update link to MOS source.
  Fix typo.
  Add price multiplicator to lazzzor list.
  Unspecified changes to the cellardoor design.
  Export list of members with lazzzor privileges.
  Import style change from live site.

Conflicts:
	announce/views.py
	members/models.py
	metalab/templates/base.html
	templates/members/members_details.inc
Merge commit '642f9ca2bb551ea471172a51c32a6ccddb1c4a70' into django_1_4_compatibility

# By Simon Repp (3) and Christoph Schindler (1)
# Via Simon Repp
* commit '642f9ca2bb551ea471172a51c32a6ccddb1c4a70':
  Correct django version requirement again
  Update middleware settings for Django 1.4.
  Change django requirement
  Initial factory_boy and python-faker integration