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.
Removed missing british Flag icon for the english pages.
Cleaned up trailing whitespace
Cleaned up trailing whitespace
Added CSRF Token
Added CSRF Token.
Merge branch 'django_1_4_compatibility' of github:Metalab/mos into django_1_4_compatibility
Use staticfiles app for assets.
Merge branch 'django_1_4_compatibility' of https://github.com/Metalab/mos into django_1_4_compatibility

Conflicts:
	metalab/templates/admin/base.html
	metalab/templates/base.html
	metalab/templates/cellardoor.html
Initial factory_boy and python-faker integration
Merge branch 'django_1_4_compatibility' of git://github.com/Metalab/mos into django_1_4_compatibility
Merge branch 'django_1_4_compatibility' of github:Metalab/mos into django_1_4_compatibility

Conflicts:
	metalab/templates/admin/base.html