Changed property name in propertiestool breaking user registration
Merge branch 'dev'
Several changes. See CHANGES.txt