updated user.behaviors to new format
Merge branch 'release-0.1.1' into develop