[added] junk dealers can be configured to accept multiple types of loot
[added] finery junk dealers will buy armor

Change-Id: I31b64bb04e5731c19454755a6c2ad148aa7b2795
[changed] droid customization life to 999 calls
[changed] droid power life to 8hrs
[changed] pet growth frequency to 12 hrs

Change-Id: I8fc4872149ff91bf9ec56053224cd37f84e0a087
Merge changes I8fc48721,I31b64bb0 into unstable

* changes:
  [changed] droid customization life to 999 calls [changed] droid power life to 8hrs [changed] pet growth frequency to 12 hrs
  [added] junk dealers can be configured to accept multiple types of loot [added] finery junk dealers will buy armor