Initial commit: add allocationMode user preference and form for choosing it
Merge branch 'develop' into sabe/attributes
Get attributes layout up-to-date with develop changes
Add debug button to hand out levels one at a time
Add attribute training to user model
Merge branch 'develop' into sabe/attributes
Merge remote-tracking branch 'origin/sabe/attributes' into develop

Conflicts:
	views/shared/footer.jade