# This is a combination of 3 commits.
# The first commit's message is:
Fix rebase conflicts

Conflicts:
	lily/accounts/forms.py
	lily/utils/models/models.py

# The 2nd commit message will be skipped:

#	More merging

# The 3rd commit message will be skipped:

#	More merging...