Fix upgrade_master  script to use new www location
Fix user_properties table, add missing index, allow cascade delete/update, add support several properties per user
Merge branch 'fixes' into staging