add xml addy
Merge branch 'maintenance'
Merge branch 'master' into maintenance
move forms out, create obj on merge del