Choices for Notes
Use category
Message generation from notes
Display initial money in resolution message
Display dividend count in message
Minor changes to message
Keys can be tuple
Dividend should be an integer
Merge branch 'master' into resolution-message

Conflicts:
	engine_modules/speculation/models.py
MDC resolution message
Merge branch 'master' of github.com:Neamar/corporate into resolution-message

Conflicts:
	engine_modules/corporation_run/models.py
Merge pull request #56 from Neamar/resolution-message

Resolution message