added userschema.xml to import default userschema on install
resolved merge conflicts